Skip to content

Commit f881d33

Browse files
0xFA110xFA11
authored
chore: cleanup/upgrade serialized scenes (#1020)
1 parent 95886c5 commit f881d33

File tree

15 files changed

+82
-117
lines changed

15 files changed

+82
-117
lines changed

‎com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ GameObject:
218218
- component: {fileID: 1102477897}
219219
- component: {fileID: 1102477896}
220220
m_Layer: 0
221-
m_Name: NetworkManager
221+
m_Name: '[NetworkManager]'
222222
m_TagString: Untagged
223223
m_Icon: {fileID: 0}
224224
m_NavMeshLayer: 0
@@ -245,9 +245,9 @@ MonoBehaviour:
245245
ServerWebsocketListenPort: 8887
246246
SupportWebsocket: 0
247247
Channels: []
248-
UseMLAPIRelay: 0
249-
MLAPIRelayAddress: 184.72.104.138
250-
MLAPIRelayPort: 8888
248+
UseNetcodeRelay: 0
249+
NetcodeRelayAddress: 127.0.0.1
250+
NetcodeRelayPort: 8888
251251
MessageSendMode: 0
252252
--- !u!114 &1102477897
253253
MonoBehaviour:
@@ -270,22 +270,27 @@ MonoBehaviour:
270270
RegisteredScenes:
271271
- NetworkPrefabGlobalObjectIdHashTests
272272
AllowRuntimeSceneChanges: 0
273+
PlayerPrefab: {fileID: 0}
273274
NetworkPrefabs:
274-
- Prefab: {fileID: 6634540090042209438, guid: 7006127095cef495b808ea027e90bf91,
275+
- Override: 0
276+
Prefab: {fileID: 6634540090042209438, guid: 7006127095cef495b808ea027e90bf91,
275277
type: 3}
276-
IsPlayer: 1
277-
- Prefab: {fileID: 5253977552660788477, guid: e9ff9ca5dee4e4a0e9aba758527ed56e,
278+
SourcePrefabToOverride: {fileID: 0}
279+
SourceHashToOverride: 0
280+
OverridingTargetPrefab: {fileID: 0}
281+
- Override: 0
282+
Prefab: {fileID: 5253977552660788477, guid: e9ff9ca5dee4e4a0e9aba758527ed56e,
278283
type: 3}
279-
IsPlayer: 0
280-
- Prefab: {fileID: 8106213239008607392, guid: 08036a5a809c74816892f96d72e1ca81,
284+
SourcePrefabToOverride: {fileID: 0}
285+
SourceHashToOverride: 0
286+
OverridingTargetPrefab: {fileID: 0}
287+
- Override: 0
288+
Prefab: {fileID: 8106213239008607392, guid: 08036a5a809c74816892f96d72e1ca81,
281289
type: 3}
282-
IsPlayer: 0
283-
PlayerPrefabHash: 2044183727
284-
CreatePlayerPrefab: 1
285-
ReceiveTickrate: 64
286-
NetworkTickIntervalSec: 0.05
287-
MaxReceiveEventsPerTickRate: 500
288-
EventTickrate: 64
290+
SourcePrefabToOverride: {fileID: 0}
291+
SourceHashToOverride: 0
292+
OverridingTargetPrefab: {fileID: 0}
293+
TickRate: 30
289294
ClientConnectionBufferTimeout: 10
290295
ConnectionApproval: 0
291296
ConnectionData:
@@ -299,7 +304,6 @@ MonoBehaviour:
299304
NetworkIdRecycleDelay: 120
300305
RpcHashSize: 0
301306
LoadSceneTimeOut: 120
302-
EnableMessageBuffering: 1
303307
MessageBufferTimeout: 20
304308
EnableNetworkLogs: 1
305309
--- !u!4 &1102477898

‎testproject/Assets/MainMenu.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -943,7 +943,7 @@ MonoBehaviour:
943943
m_HorizontalOverflow: 0
944944
m_VerticalOverflow: 0
945945
m_LineSpacing: 1
946-
m_Text: MLAPI Main Menu
946+
m_Text: Netcode Main Menu
947947
--- !u!222 &1178849204
948948
CanvasRenderer:
949949
m_ObjectHideFlags: 0

‎testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.unity

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -631,7 +631,6 @@ MeshRenderer:
631631
m_CastShadows: 1
632632
m_ReceiveShadows: 1
633633
m_DynamicOccludee: 1
634-
m_StaticShadowCaster: 0
635634
m_MotionVectors: 1
636635
m_LightProbeUsage: 1
637636
m_ReflectionProbeUsage: 1
@@ -727,7 +726,6 @@ MeshRenderer:
727726
m_CastShadows: 1
728727
m_ReceiveShadows: 1
729728
m_DynamicOccludee: 1
730-
m_StaticShadowCaster: 0
731729
m_MotionVectors: 1
732730
m_LightProbeUsage: 1
733731
m_ReflectionProbeUsage: 1
@@ -823,7 +821,6 @@ MeshRenderer:
823821
m_CastShadows: 1
824822
m_ReceiveShadows: 1
825823
m_DynamicOccludee: 1
826-
m_StaticShadowCaster: 0
827824
m_MotionVectors: 1
828825
m_LightProbeUsage: 1
829826
m_ReflectionProbeUsage: 1
@@ -1323,7 +1320,6 @@ MeshRenderer:
13231320
m_CastShadows: 1
13241321
m_ReceiveShadows: 1
13251322
m_DynamicOccludee: 1
1326-
m_StaticShadowCaster: 0
13271323
m_MotionVectors: 1
13281324
m_LightProbeUsage: 1
13291325
m_ReflectionProbeUsage: 1
@@ -1409,7 +1405,7 @@ GameObject:
14091405
- component: {fileID: 1706952616}
14101406
- component: {fileID: 1706952615}
14111407
m_Layer: 0
1412-
m_Name: NetworkManager
1408+
m_Name: '[NetworkManager]'
14131409
m_TagString: Untagged
14141410
m_Icon: {fileID: 0}
14151411
m_NavMeshLayer: 0
@@ -1440,10 +1436,7 @@ MonoBehaviour:
14401436
PlayerPrefab: {fileID: 4079352819444256614, guid: c16f03336b6104576a565ef79ad643c0,
14411437
type: 3}
14421438
NetworkPrefabs: []
1443-
ReceiveTickrate: 64
1444-
NetworkTickIntervalSec: 0.05
1445-
MaxReceiveEventsPerTickRate: 500
1446-
EventTickrate: 64
1439+
TickRate: 30
14471440
ClientConnectionBufferTimeout: 10
14481441
ConnectionApproval: 0
14491442
ConnectionData:
@@ -1457,7 +1450,6 @@ MonoBehaviour:
14571450
NetworkIdRecycleDelay: 120
14581451
RpcHashSize: 0
14591452
LoadSceneTimeOut: 120
1460-
EnableMessageBuffering: 1
14611453
MessageBufferTimeout: 20
14621454
EnableNetworkLogs: 1
14631455
--- !u!114 &1706952616
@@ -1481,9 +1473,9 @@ MonoBehaviour:
14811473
ServerWebsocketListenPort: 8887
14821474
SupportWebsocket: 0
14831475
Channels: []
1484-
UseMLAPIRelay: 0
1485-
MLAPIRelayAddress: 184.72.104.138
1486-
MLAPIRelayPort: 8888
1476+
UseNetcodeRelay: 0
1477+
NetcodeRelayAddress: 127.0.0.1
1478+
NetcodeRelayPort: 8888
14871479
MessageSendMode: 0
14881480
--- !u!4 &1706952617
14891481
Transform:
@@ -1622,7 +1614,6 @@ MeshRenderer:
16221614
m_CastShadows: 1
16231615
m_ReceiveShadows: 1
16241616
m_DynamicOccludee: 1
1625-
m_StaticShadowCaster: 0
16261617
m_MotionVectors: 1
16271618
m_LightProbeUsage: 1
16281619
m_ReflectionProbeUsage: 1

‎testproject/Assets/Samples/PrefabPool/PrefabPoolExample.unity

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -265,7 +265,6 @@ MeshRenderer:
265265
m_CastShadows: 1
266266
m_ReceiveShadows: 1
267267
m_DynamicOccludee: 1
268-
m_StaticShadowCaster: 0
269268
m_MotionVectors: 1
270269
m_LightProbeUsage: 1
271270
m_ReflectionProbeUsage: 1
@@ -564,7 +563,6 @@ MeshRenderer:
564563
m_CastShadows: 1
565564
m_ReceiveShadows: 1
566565
m_DynamicOccludee: 1
567-
m_StaticShadowCaster: 0
568566
m_MotionVectors: 1
569567
m_LightProbeUsage: 1
570568
m_ReflectionProbeUsage: 1
@@ -852,7 +850,7 @@ GameObject:
852850
- component: {fileID: 1024114719}
853851
- component: {fileID: 1024114718}
854852
m_Layer: 0
855-
m_Name: NetworkManager
853+
m_Name: '[NetworkManager]'
856854
m_TagString: Untagged
857855
m_Icon: {fileID: 0}
858856
m_NavMeshLayer: 0
@@ -927,9 +925,9 @@ MonoBehaviour:
927925
ServerWebsocketListenPort: 8887
928926
SupportWebsocket: 0
929927
Channels: []
930-
UseMLAPIRelay: 0
931-
MLAPIRelayAddress: 184.72.104.138
932-
MLAPIRelayPort: 8888
928+
UseNetcodeRelay: 0
929+
NetcodeRelayAddress: 127.0.0.1
930+
NetcodeRelayPort: 8888
933931
MessageSendMode: 0
934932
--- !u!4 &1024114720
935933
Transform:
@@ -1087,7 +1085,6 @@ MeshRenderer:
10871085
m_CastShadows: 1
10881086
m_ReceiveShadows: 1
10891087
m_DynamicOccludee: 1
1090-
m_StaticShadowCaster: 0
10911088
m_MotionVectors: 1
10921089
m_LightProbeUsage: 1
10931090
m_ReflectionProbeUsage: 1
@@ -1461,7 +1458,6 @@ MeshRenderer:
14611458
m_CastShadows: 1
14621459
m_ReceiveShadows: 1
14631460
m_DynamicOccludee: 1
1464-
m_StaticShadowCaster: 0
14651461
m_MotionVectors: 1
14661462
m_LightProbeUsage: 1
14671463
m_ReflectionProbeUsage: 1
@@ -1682,7 +1678,6 @@ MeshRenderer:
16821678
m_CastShadows: 1
16831679
m_ReceiveShadows: 1
16841680
m_DynamicOccludee: 1
1685-
m_StaticShadowCaster: 0
16861681
m_MotionVectors: 1
16871682
m_LightProbeUsage: 1
16881683
m_ReflectionProbeUsage: 1

‎testproject/Assets/Samples/PrefabPool/PrefabPoolOverrideExample.unity

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -265,7 +265,6 @@ MeshRenderer:
265265
m_CastShadows: 1
266266
m_ReceiveShadows: 1
267267
m_DynamicOccludee: 1
268-
m_StaticShadowCaster: 0
269268
m_MotionVectors: 1
270269
m_LightProbeUsage: 1
271270
m_ReflectionProbeUsage: 1
@@ -564,7 +563,6 @@ MeshRenderer:
564563
m_CastShadows: 1
565564
m_ReceiveShadows: 1
566565
m_DynamicOccludee: 1
567-
m_StaticShadowCaster: 0
568566
m_MotionVectors: 1
569567
m_LightProbeUsage: 1
570568
m_ReflectionProbeUsage: 1
@@ -852,7 +850,7 @@ GameObject:
852850
- component: {fileID: 1024114719}
853851
- component: {fileID: 1024114718}
854852
m_Layer: 0
855-
m_Name: NetworkManager
853+
m_Name: '[NetworkManager]'
856854
m_TagString: Untagged
857855
m_Icon: {fileID: 0}
858856
m_NavMeshLayer: 0
@@ -928,9 +926,9 @@ MonoBehaviour:
928926
ServerWebsocketListenPort: 8887
929927
SupportWebsocket: 0
930928
Channels: []
931-
UseMLAPIRelay: 0
932-
MLAPIRelayAddress: 184.72.104.138
933-
MLAPIRelayPort: 8888
929+
UseNetcodeRelay: 0
930+
NetcodeRelayAddress: 127.0.0.1
931+
NetcodeRelayPort: 8888
934932
MessageSendMode: 0
935933
--- !u!4 &1024114720
936934
Transform:
@@ -984,7 +982,6 @@ MonoBehaviour:
984982
- {fileID: 1991364468704639885, guid: 2ab098de4ccb3a8459b88084b29fd0ac, type: 3}
985983
- {fileID: 6137946741893414299, guid: d2bccc96d1636264fa43b546a1b617c3, type: 3}
986984
m_ObjectPoolSize: 15
987-
m_SynchronizeOverrides: 1
988985
m_SpawnsPerSecond: 2
989986
--- !u!4 &1113539280
990987
Transform:
@@ -1094,7 +1091,6 @@ MeshRenderer:
10941091
m_CastShadows: 1
10951092
m_ReceiveShadows: 1
10961093
m_DynamicOccludee: 1
1097-
m_StaticShadowCaster: 0
10981094
m_MotionVectors: 1
10991095
m_LightProbeUsage: 1
11001096
m_ReflectionProbeUsage: 1
@@ -1468,7 +1464,6 @@ MeshRenderer:
14681464
m_CastShadows: 1
14691465
m_ReceiveShadows: 1
14701466
m_DynamicOccludee: 1
1471-
m_StaticShadowCaster: 0
14721467
m_MotionVectors: 1
14731468
m_LightProbeUsage: 1
14741469
m_ReflectionProbeUsage: 1
@@ -1689,7 +1684,6 @@ MeshRenderer:
16891684
m_CastShadows: 1
16901685
m_ReceiveShadows: 1
16911686
m_DynamicOccludee: 1
1692-
m_StaticShadowCaster: 0
16931687
m_MotionVectors: 1
16941688
m_LightProbeUsage: 1
16951689
m_ReflectionProbeUsage: 1

‎testproject/Assets/Samples/SamplesMenu.unity

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -1896,7 +1896,7 @@ MonoBehaviour:
18961896
m_HorizontalOverflow: 0
18971897
m_VerticalOverflow: 0
18981898
m_LineSpacing: 1
1899-
m_Text: MLAPI SAMPLES
1899+
m_Text: Netcode Samples
19001900
--- !u!222 &1996333346
19011901
CanvasRenderer:
19021902
m_ObjectHideFlags: 0
@@ -3598,7 +3598,7 @@ MonoBehaviour:
35983598
m_HorizontalOverflow: 0
35993599
m_VerticalOverflow: 0
36003600
m_LineSpacing: 1
3601-
m_Text: MLAPI
3601+
m_Text: Netcode Samples
36023602
--- !u!222 &8786710036155684099
36033603
CanvasRenderer:
36043604
m_ObjectHideFlags: 0

‎testproject/Assets/Scenes/MultiprocessTestScene.unity

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ GameObject:
658658
- component: {fileID: 1211923377}
659659
- component: {fileID: 1211923378}
660660
m_Layer: 0
661-
m_Name: NetworkManager-Multiprocess
661+
m_Name: '[NetworkManager] (Multiprocess)'
662662
m_TagString: Untagged
663663
m_Icon: {fileID: 0}
664664
m_NavMeshLayer: 0
@@ -695,10 +695,7 @@ MonoBehaviour:
695695
SourcePrefabToOverride: {fileID: 0}
696696
SourceHashToOverride: 0
697697
OverridingTargetPrefab: {fileID: 0}
698-
ReceiveTickrate: 64
699-
NetworkTickIntervalSec: 0.05
700-
MaxReceiveEventsPerTickRate: -1
701-
EventTickrate: 64
698+
TickRate: 30
702699
ClientConnectionBufferTimeout: 10
703700
ConnectionApproval: 0
704701
ConnectionData:
@@ -712,7 +709,6 @@ MonoBehaviour:
712709
NetworkIdRecycleDelay: 120
713710
RpcHashSize: 0
714711
LoadSceneTimeOut: 120
715-
EnableMessageBuffering: 1
716712
MessageBufferTimeout: 20
717713
EnableNetworkLogs: 1
718714
--- !u!4 &1211923376
@@ -869,9 +865,9 @@ MonoBehaviour:
869865
ServerWebsocketListenPort: 8887
870866
SupportWebsocket: 0
871867
Channels: []
872-
UseMLAPIRelay: 0
873-
MLAPIRelayAddress: 184.72.104.138
874-
MLAPIRelayPort: 8888
868+
UseNetcodeRelay: 0
869+
NetcodeRelayAddress: 127.0.0.1
870+
NetcodeRelayPort: 8888
875871
MessageSendMode: 0
876872
--- !u!1 &2027640071
877873
GameObject:

0 commit comments

Comments
 (0)