Skip to content

Commit e76bfcf

Browse files
fernando-cortezfernando-cortez
committed
network simulator toggle converted
1 parent 604447d commit e76bfcf

File tree

4 files changed

+101
-40
lines changed

4 files changed

+101
-40
lines changed

‎Assets/InputSystem/PlayerActions.inputactions‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,15 @@
175175
"processors": "",
176176
"interactions": "",
177177
"initialStateCheck": false
178+
},
179+
{
180+
"name": "ToggleNetworkSimulator",
181+
"type": "Button",
182+
"id": "8b27e946-68af-4c4d-ba82-d2cb4a866217",
183+
"expectedControlType": "",
184+
"processors": "",
185+
"interactions": "",
186+
"initialStateCheck": false
178187
}
179188
],
180189
"bindings": [
@@ -683,6 +692,28 @@
683692
"action": "ToggleNetworkStats",
684693
"isComposite": false,
685694
"isPartOfComposite": false
695+
},
696+
{
697+
"name": "",
698+
"id": "a2f7fe81-4374-49f6-ac91-31f25ff7695f",
699+
"path": "<Keyboard>/tab",
700+
"interactions": "",
701+
"processors": "",
702+
"groups": "",
703+
"action": "ToggleNetworkSimulator",
704+
"isComposite": false,
705+
"isPartOfComposite": false
706+
},
707+
{
708+
"name": "",
709+
"id": "b1533cc3-511d-496b-ba9a-8d5606061c26",
710+
"path": "<Touchscreen>/touch4/tap",
711+
"interactions": "",
712+
"processors": "",
713+
"groups": ";Touch",
714+
"action": "ToggleNetworkSimulator",
715+
"isComposite": false,
716+
"isPartOfComposite": false
686717
}
687718
]
688719
},

‎Assets/Prefabs/UI/NetworkSimulator.prefab‎

Lines changed: 57 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,17 @@ MonoBehaviour:
108108
m_lineSpacingMax: 0
109109
m_paragraphSpacing: 0
110110
m_charWidthMaxAdj: 0
111-
m_enableWordWrapping: 1
111+
m_TextWrappingMode: 1
112112
m_wordWrappingRatios: 0.4
113113
m_overflowMode: 0
114114
m_linkedTextComponent: {fileID: 0}
115115
parentLinkedComponent: {fileID: 0}
116116
m_enableKerning: 1
117+
m_ActiveFontFeatures: 6e72656b
117118
m_enableExtraPadding: 0
118119
checkPaddingRequired: 0
119120
m_isRichText: 1
121+
m_EmojiFallbackSupport: 1
120122
m_parseCtrlCharacters: 1
121123
m_isOrthographic: 1
122124
m_isCullingEnabled: 0
@@ -242,15 +244,17 @@ MonoBehaviour:
242244
m_lineSpacingMax: 0
243245
m_paragraphSpacing: 0
244246
m_charWidthMaxAdj: 0
245-
m_enableWordWrapping: 0
247+
m_TextWrappingMode: 0
246248
m_wordWrappingRatios: 0.4
247249
m_overflowMode: 1
248250
m_linkedTextComponent: {fileID: 0}
249251
parentLinkedComponent: {fileID: 0}
250252
m_enableKerning: 1
253+
m_ActiveFontFeatures: 6e72656b
251254
m_enableExtraPadding: 0
252255
checkPaddingRequired: 0
253256
m_isRichText: 1
257+
m_EmojiFallbackSupport: 1
254258
m_parseCtrlCharacters: 1
255259
m_isOrthographic: 1
256260
m_isCullingEnabled: 0
@@ -301,7 +305,7 @@ RectTransform:
301305
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
302306
m_AnchorMin: {x: 0, y: 1}
303307
m_AnchorMax: {x: 1, y: 1}
304-
m_AnchoredPosition: {x: 0.000030517578, y: 0.0000076293945}
308+
m_AnchoredPosition: {x: 0.000030517578, y: 0}
305309
m_SizeDelta: {x: -0.0000076293945, y: 44.06}
306310
m_Pivot: {x: 0.5, y: 1}
307311
--- !u!1 &1187890238645865266
@@ -412,15 +416,17 @@ MonoBehaviour:
412416
m_lineSpacingMax: 0
413417
m_paragraphSpacing: 0
414418
m_charWidthMaxAdj: 0
415-
m_enableWordWrapping: 1
419+
m_TextWrappingMode: 1
416420
m_wordWrappingRatios: 0.4
417421
m_overflowMode: 0
418422
m_linkedTextComponent: {fileID: 0}
419423
parentLinkedComponent: {fileID: 0}
420424
m_enableKerning: 1
425+
m_ActiveFontFeatures: 6e72656b
421426
m_enableExtraPadding: 0
422427
checkPaddingRequired: 0
423428
m_isRichText: 1
429+
m_EmojiFallbackSupport: 1
424430
m_parseCtrlCharacters: 1
425431
m_isOrthographic: 1
426432
m_isCullingEnabled: 0
@@ -772,6 +778,7 @@ MonoBehaviour:
772778
m_ScenariosButtonText: {fileID: 3849933660557125965}
773779
m_LagSpikeDuration: {fileID: 8516948734797190670}
774780
m_OpenWindowKeyCode: 9
781+
m_ToggleNetworkSimulatorAction: {fileID: 34288948611290012, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
775782
m_ConnectionsCycleConfigurations:
776783
- m_ClassPreset:
777784
rid: 3384652154820362241
@@ -811,7 +818,7 @@ MonoBehaviour:
811818
- rid: 3384652154820362242
812819
type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime}
813820
data:
814-
<Name>k__BackingField: Home Broadband [WIFI, Cable, Console, PC]
821+
<Name>k__BackingField: 'Home Broadband [WIFI, Cable, Console, PC]'
815822
<Description>k__BackingField: Typical of desktop and console platforms (and
816823
generally speaking most mobile players too).
817824
<PacketDelayMs>k__BackingField: 32
@@ -821,7 +828,7 @@ MonoBehaviour:
821828
- rid: 3384652154820362244
822829
type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime}
823830
data:
824-
<Name>k__BackingField: Mobile 5G ['20]
831+
<Name>k__BackingField: 'Mobile 5G [''20]'
825832
<Description>k__BackingField: In many places, expect this to be 'as good
826833
as' or 'better than' home broadband.
827834
<PacketDelayMs>k__BackingField: 30
@@ -1011,15 +1018,17 @@ MonoBehaviour:
10111018
m_lineSpacingMax: 0
10121019
m_paragraphSpacing: 0
10131020
m_charWidthMaxAdj: 0
1014-
m_enableWordWrapping: 0
1021+
m_TextWrappingMode: 0
10151022
m_wordWrappingRatios: 0.4
10161023
m_overflowMode: 1
10171024
m_linkedTextComponent: {fileID: 0}
10181025
parentLinkedComponent: {fileID: 0}
10191026
m_enableKerning: 1
1027+
m_ActiveFontFeatures: 6e72656b
10201028
m_enableExtraPadding: 0
10211029
checkPaddingRequired: 0
10221030
m_isRichText: 1
1031+
m_EmojiFallbackSupport: 1
10231032
m_parseCtrlCharacters: 1
10241033
m_isOrthographic: 1
10251034
m_isCullingEnabled: 0
@@ -1274,15 +1283,17 @@ MonoBehaviour:
12741283
m_lineSpacingMax: 0
12751284
m_paragraphSpacing: 0
12761285
m_charWidthMaxAdj: 0
1277-
m_enableWordWrapping: 0
1286+
m_TextWrappingMode: 0
12781287
m_wordWrappingRatios: 0.4
12791288
m_overflowMode: 1
12801289
m_linkedTextComponent: {fileID: 0}
12811290
parentLinkedComponent: {fileID: 0}
12821291
m_enableKerning: 1
1292+
m_ActiveFontFeatures: 6e72656b
12831293
m_enableExtraPadding: 1
12841294
checkPaddingRequired: 0
12851295
m_isRichText: 1
1296+
m_EmojiFallbackSupport: 1
12861297
m_parseCtrlCharacters: 1
12871298
m_isOrthographic: 1
12881299
m_isCullingEnabled: 0
@@ -1536,7 +1547,7 @@ RectTransform:
15361547
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15371548
m_AnchorMin: {x: 0, y: 1}
15381549
m_AnchorMax: {x: 1, y: 1}
1539-
m_AnchoredPosition: {x: 0.000030517578, y: 0}
1550+
m_AnchoredPosition: {x: 0.000030517578, y: -0.000022888184}
15401551
m_SizeDelta: {x: -0.0000076293945, y: 44.06}
15411552
m_Pivot: {x: 0.5, y: 1}
15421553
--- !u!1 &3220895239932877001
@@ -1647,15 +1658,17 @@ MonoBehaviour:
16471658
m_lineSpacingMax: 0
16481659
m_paragraphSpacing: 0
16491660
m_charWidthMaxAdj: 0
1650-
m_enableWordWrapping: 1
1661+
m_TextWrappingMode: 1
16511662
m_wordWrappingRatios: 0.4
16521663
m_overflowMode: 0
16531664
m_linkedTextComponent: {fileID: 0}
16541665
parentLinkedComponent: {fileID: 0}
16551666
m_enableKerning: 1
1667+
m_ActiveFontFeatures: 6e72656b
16561668
m_enableExtraPadding: 0
16571669
checkPaddingRequired: 0
16581670
m_isRichText: 1
1671+
m_EmojiFallbackSupport: 1
16591672
m_parseCtrlCharacters: 1
16601673
m_isOrthographic: 1
16611674
m_isCullingEnabled: 0
@@ -1781,15 +1794,17 @@ MonoBehaviour:
17811794
m_lineSpacingMax: 0
17821795
m_paragraphSpacing: 0
17831796
m_charWidthMaxAdj: 0
1784-
m_enableWordWrapping: 0
1797+
m_TextWrappingMode: 3
17851798
m_wordWrappingRatios: 0.4
17861799
m_overflowMode: 1
17871800
m_linkedTextComponent: {fileID: 0}
17881801
parentLinkedComponent: {fileID: 0}
17891802
m_enableKerning: 1
1803+
m_ActiveFontFeatures: 6e72656b
17901804
m_enableExtraPadding: 1
17911805
checkPaddingRequired: 0
17921806
m_isRichText: 1
1807+
m_EmojiFallbackSupport: 1
17931808
m_parseCtrlCharacters: 1
17941809
m_isOrthographic: 1
17951810
m_isCullingEnabled: 0
@@ -1935,6 +1950,7 @@ MonoBehaviour:
19351950
m_ItemText: {fileID: 5108426573990114642}
19361951
m_ItemImage: {fileID: 0}
19371952
m_Value: 0
1953+
m_MultiSelect: 0
19381954
m_Options:
19391955
m_Options: []
19401956
m_OnValueChanged:
@@ -2656,15 +2672,17 @@ MonoBehaviour:
26562672
m_lineSpacingMax: 0
26572673
m_paragraphSpacing: 0
26582674
m_charWidthMaxAdj: 0
2659-
m_enableWordWrapping: 1
2675+
m_TextWrappingMode: 1
26602676
m_wordWrappingRatios: 0.4
26612677
m_overflowMode: 0
26622678
m_linkedTextComponent: {fileID: 0}
26632679
parentLinkedComponent: {fileID: 0}
26642680
m_enableKerning: 1
2681+
m_ActiveFontFeatures: 6e72656b
26652682
m_enableExtraPadding: 0
26662683
checkPaddingRequired: 0
26672684
m_isRichText: 1
2685+
m_EmojiFallbackSupport: 1
26682686
m_parseCtrlCharacters: 1
26692687
m_isOrthographic: 1
26702688
m_isCullingEnabled: 0
@@ -3286,7 +3304,7 @@ MonoBehaviour:
32863304
m_EditorClassIdentifier:
32873305
m_PresetAsset: {fileID: 0}
32883306
m_PresetReference:
3289-
rid: 6605000672329859073
3307+
rid: 2061385516771704978
32903308
m_Scenario:
32913309
rid: -2
32923310
m_IsScenarioSettingsFolded: 1
@@ -3296,7 +3314,7 @@ MonoBehaviour:
32963314
RefIds:
32973315
- rid: -2
32983316
type: {class: , ns: , asm: }
3299-
- rid: 6605000672329859073
3317+
- rid: 2061385516771704978
33003318
type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime}
33013319
data:
33023320
<Name>k__BackingField: None
@@ -3709,15 +3727,17 @@ MonoBehaviour:
37093727
m_lineSpacingMax: 0
37103728
m_paragraphSpacing: 0
37113729
m_charWidthMaxAdj: 0
3712-
m_enableWordWrapping: 1
3730+
m_TextWrappingMode: 1
37133731
m_wordWrappingRatios: 0.4
37143732
m_overflowMode: 0
37153733
m_linkedTextComponent: {fileID: 0}
37163734
parentLinkedComponent: {fileID: 0}
37173735
m_enableKerning: 1
3736+
m_ActiveFontFeatures: 6e72656b
37183737
m_enableExtraPadding: 0
37193738
checkPaddingRequired: 0
37203739
m_isRichText: 1
3740+
m_EmojiFallbackSupport: 1
37213741
m_parseCtrlCharacters: 1
37223742
m_isOrthographic: 1
37233743
m_isCullingEnabled: 0
@@ -3843,15 +3863,17 @@ MonoBehaviour:
38433863
m_lineSpacingMax: 0
38443864
m_paragraphSpacing: 0
38453865
m_charWidthMaxAdj: 0
3846-
m_enableWordWrapping: 1
3866+
m_TextWrappingMode: 1
38473867
m_wordWrappingRatios: 0.4
38483868
m_overflowMode: 0
38493869
m_linkedTextComponent: {fileID: 0}
38503870
parentLinkedComponent: {fileID: 0}
38513871
m_enableKerning: 1
3872+
m_ActiveFontFeatures: 6e72656b
38523873
m_enableExtraPadding: 0
38533874
checkPaddingRequired: 0
38543875
m_isRichText: 1
3876+
m_EmojiFallbackSupport: 1
38553877
m_parseCtrlCharacters: 1
38563878
m_isOrthographic: 1
38573879
m_isCullingEnabled: 0
@@ -4129,10 +4151,13 @@ MonoBehaviour:
41294151
m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
41304152
m_OnFocusSelectAll: 1
41314153
m_ResetOnDeActivation: 1
4154+
m_KeepTextSelectionVisible: 0
41324155
m_RestoreOriginalTextOnEscape: 1
41334156
m_isRichTextEditingAllowed: 0
41344157
m_LineLimit: 0
4158+
isAlert: 0
41354159
m_InputValidator: {fileID: 0}
4160+
m_ShouldActivateOnSelect: 1
41364161
--- !u!1 &7571868317983907511
41374162
GameObject:
41384163
m_ObjectHideFlags: 0
@@ -4614,15 +4639,17 @@ MonoBehaviour:
46144639
m_lineSpacingMax: 0
46154640
m_paragraphSpacing: 0
46164641
m_charWidthMaxAdj: 0
4617-
m_enableWordWrapping: 1
4642+
m_TextWrappingMode: 1
46184643
m_wordWrappingRatios: 0.4
46194644
m_overflowMode: 0
46204645
m_linkedTextComponent: {fileID: 0}
46214646
parentLinkedComponent: {fileID: 0}
46224647
m_enableKerning: 1
4648+
m_ActiveFontFeatures: 6e72656b
46234649
m_enableExtraPadding: 0
46244650
checkPaddingRequired: 0
46254651
m_isRichText: 1
4652+
m_EmojiFallbackSupport: 1
46264653
m_parseCtrlCharacters: 1
46274654
m_isOrthographic: 1
46284655
m_isCullingEnabled: 0
@@ -4768,6 +4795,7 @@ MonoBehaviour:
47684795
m_ItemText: {fileID: 2572370505331673721}
47694796
m_ItemImage: {fileID: 0}
47704797
m_Value: 0
4798+
m_MultiSelect: 0
47714799
m_Options:
47724800
m_Options: []
47734801
m_OnValueChanged:
@@ -4798,6 +4826,10 @@ PrefabInstance:
47984826
propertyPath: m_enableAutoSizing
47994827
value: 0
48004828
objectReference: {fileID: 0}
4829+
- target: {fileID: 5700619323420510958, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3}
4830+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
4831+
value: 1801810542
4832+
objectReference: {fileID: 0}
48014833
- target: {fileID: 5700619323420510961, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3}
48024834
propertyPath: m_AnchorMax.x
48034835
value: 1
@@ -4964,6 +4996,10 @@ PrefabInstance:
49644996
propertyPath: m_fontSize
49654997
value: 36
49664998
objectReference: {fileID: 0}
4999+
- target: {fileID: 5700619323420510958, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3}
5000+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
5001+
value: 1801810542
5002+
objectReference: {fileID: 0}
49675003
- target: {fileID: 5700619323602338836, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3}
49685004
propertyPath: m_Type
49695005
value: 1
@@ -5106,6 +5142,10 @@ PrefabInstance:
51065142
propertyPath: m_enableAutoSizing
51075143
value: 0
51085144
objectReference: {fileID: 0}
5145+
- target: {fileID: 5700619323420510958, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3}
5146+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
5147+
value: 1801810542
5148+
objectReference: {fileID: 0}
51095149
- target: {fileID: 5700619323420510961, guid: 2f2de97a89d7bef42919fd16c2f87f10, type: 3}
51105150
propertyPath: m_AnchorMax.x
51115151
value: 1

0 commit comments

Comments
 (0)