Skip to content

chore: cleanup/upgrade serialized scenes #1020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xFA11 merged 4 commits into from
Aug 4, 2021
Merged

chore: cleanup/upgrade serialized scenes #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb4c894
chore: replace MLAPI with Netcode in C# source files
0xFA11 Aug 4, 2021
9e886d5
chore: cleanup/upgrade serialized scenes
0xFA11 Aug 4, 2021
eaef037
Merge branch 'develop' into chore/cleanup-scenes
0xFA11 Aug 4, 2021
4ee17b7
update GameObject.Find() calls
0xFA11 Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions ...iplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ GameObject:
- component: {fileID: 1102477897}
- component: {fileID: 1102477896}
m_Layer: 0
m_Name: NetworkManager
m_Name: '[NetworkManager]'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -245,9 +245,9 @@ MonoBehaviour:
ServerWebsocketListenPort: 8887
SupportWebsocket: 0
Channels: []
UseMLAPIRelay: 0
MLAPIRelayAddress: 184.72.104.138
MLAPIRelayPort: 8888
UseNetcodeRelay: 0
NetcodeRelayAddress: 127.0.0.1
NetcodeRelayPort: 8888
MessageSendMode: 0
--- !u!114 &1102477897
MonoBehaviour:
Expand All @@ -270,22 +270,27 @@ MonoBehaviour:
RegisteredScenes:
- NetworkPrefabGlobalObjectIdHashTests
AllowRuntimeSceneChanges: 0
PlayerPrefab: {fileID: 0}
NetworkPrefabs:
- Prefab: {fileID: 6634540090042209438, guid: 7006127095cef495b808ea027e90bf91,
- Override: 0
Prefab: {fileID: 6634540090042209438, guid: 7006127095cef495b808ea027e90bf91,
type: 3}
IsPlayer: 1
- Prefab: {fileID: 5253977552660788477, guid: e9ff9ca5dee4e4a0e9aba758527ed56e,
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}
- Override: 0
Prefab: {fileID: 5253977552660788477, guid: e9ff9ca5dee4e4a0e9aba758527ed56e,
type: 3}
IsPlayer: 0
- Prefab: {fileID: 8106213239008607392, guid: 08036a5a809c74816892f96d72e1ca81,
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}
- Override: 0
Prefab: {fileID: 8106213239008607392, guid: 08036a5a809c74816892f96d72e1ca81,
type: 3}
IsPlayer: 0
PlayerPrefabHash: 2044183727
CreatePlayerPrefab: 1
ReceiveTickrate: 64
NetworkTickIntervalSec: 0.05
MaxReceiveEventsPerTickRate: 500
EventTickrate: 64
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}
TickRate: 30
ClientConnectionBufferTimeout: 10
ConnectionApproval: 0
ConnectionData:
Expand All @@ -299,7 +304,6 @@ MonoBehaviour:
NetworkIdRecycleDelay: 120
RpcHashSize: 0
LoadSceneTimeOut: 120
EnableMessageBuffering: 1
MessageBufferTimeout: 20
EnableNetworkLogs: 1
--- !u!4 &1102477898
Expand Down
4 changes: 2 additions & 2 deletions testproject/Assets/MainMenu.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -943,7 +943,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: MLAPI Main Menu
m_Text: Netcode Main Menu
--- !u!222 &1178849204
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down
21 changes: 6 additions & 15 deletions testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -631,7 +631,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -727,7 +726,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -823,7 +821,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -1323,7 +1320,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -1409,7 +1405,7 @@ GameObject:
- component: {fileID: 1706952616}
- component: {fileID: 1706952615}
m_Layer: 0
m_Name: NetworkManager
m_Name: '[NetworkManager]'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -1440,10 +1436,7 @@ MonoBehaviour:
PlayerPrefab: {fileID: 4079352819444256614, guid: c16f03336b6104576a565ef79ad643c0,
type: 3}
NetworkPrefabs: []
ReceiveTickrate: 64
NetworkTickIntervalSec: 0.05
MaxReceiveEventsPerTickRate: 500
EventTickrate: 64
TickRate: 30
ClientConnectionBufferTimeout: 10
ConnectionApproval: 0
ConnectionData:
Expand All @@ -1457,7 +1450,6 @@ MonoBehaviour:
NetworkIdRecycleDelay: 120
RpcHashSize: 0
LoadSceneTimeOut: 120
EnableMessageBuffering: 1
MessageBufferTimeout: 20
EnableNetworkLogs: 1
--- !u!114 &1706952616
Expand All @@ -1481,9 +1473,9 @@ MonoBehaviour:
ServerWebsocketListenPort: 8887
SupportWebsocket: 0
Channels: []
UseMLAPIRelay: 0
MLAPIRelayAddress: 184.72.104.138
MLAPIRelayPort: 8888
UseNetcodeRelay: 0
NetcodeRelayAddress: 127.0.0.1
NetcodeRelayPort: 8888
MessageSendMode: 0
--- !u!4 &1706952617
Transform:
Expand Down Expand Up @@ -1622,7 +1614,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down
15 changes: 5 additions & 10 deletions testproject/Assets/Samples/PrefabPool/PrefabPoolExample.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -265,7 +265,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -564,7 +563,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -852,7 +850,7 @@ GameObject:
- component: {fileID: 1024114719}
- component: {fileID: 1024114718}
m_Layer: 0
m_Name: NetworkManager
m_Name: '[NetworkManager]'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -927,9 +925,9 @@ MonoBehaviour:
ServerWebsocketListenPort: 8887
SupportWebsocket: 0
Channels: []
UseMLAPIRelay: 0
MLAPIRelayAddress: 184.72.104.138
MLAPIRelayPort: 8888
UseNetcodeRelay: 0
NetcodeRelayAddress: 127.0.0.1
NetcodeRelayPort: 8888
MessageSendMode: 0
--- !u!4 &1024114720
Transform:
Expand Down Expand Up @@ -1087,7 +1085,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -1461,7 +1458,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -1682,7 +1678,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down
16 changes: 5 additions & 11 deletions testproject/Assets/Samples/PrefabPool/PrefabPoolOverrideExample.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -265,7 +265,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -564,7 +563,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -852,7 +850,7 @@ GameObject:
- component: {fileID: 1024114719}
- component: {fileID: 1024114718}
m_Layer: 0
m_Name: NetworkManager
m_Name: '[NetworkManager]'
Copy link
Copy Markdown
Contributor Author

@0xFA11 0xFA11 Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to change at least a thing in the scenes to cause Unity to re-serialize scenes down to disk.
So I surrounded NetworkManager objects in scenes with square brackets.

m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -928,9 +926,9 @@ MonoBehaviour:
ServerWebsocketListenPort: 8887
SupportWebsocket: 0
Channels: []
UseMLAPIRelay: 0
MLAPIRelayAddress: 184.72.104.138
MLAPIRelayPort: 8888
UseNetcodeRelay: 0
NetcodeRelayAddress: 127.0.0.1
NetcodeRelayPort: 8888
Copy link
Copy Markdown
Contributor Author

@0xFA11 0xFA11 Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and these are the real changes

MessageSendMode: 0
--- !u!4 &1024114720
Transform:
Expand Down Expand Up @@ -984,7 +982,6 @@ MonoBehaviour:
- {fileID: 1991364468704639885, guid: 2ab098de4ccb3a8459b88084b29fd0ac, type: 3}
- {fileID: 6137946741893414299, guid: d2bccc96d1636264fa43b546a1b617c3, type: 3}
m_ObjectPoolSize: 15
m_SynchronizeOverrides: 1
m_SpawnsPerSecond: 2
--- !u!4 &1113539280
Transform:
Expand Down Expand Up @@ -1094,7 +1091,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -1468,7 +1464,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down Expand Up @@ -1689,7 +1684,6 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
Expand Down
6 changes: 3 additions & 3 deletions testproject/Assets/Samples/SamplesMenu.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -1896,7 +1896,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: MLAPI SAMPLES
m_Text: Netcode Samples
--- !u!222 &1996333346
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3598,7 +3598,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: MLAPI
m_Text: Netcode Samples
--- !u!222 &8786710036155684099
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down
14 changes: 5 additions & 9 deletions testproject/Assets/Scenes/MultiprocessTestScene.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ GameObject:
- component: {fileID: 1211923377}
- component: {fileID: 1211923378}
m_Layer: 0
m_Name: NetworkManager-Multiprocess
m_Name: '[NetworkManager] (Multiprocess)'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -695,10 +695,7 @@ MonoBehaviour:
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}
ReceiveTickrate: 64
NetworkTickIntervalSec: 0.05
MaxReceiveEventsPerTickRate: -1
EventTickrate: 64
TickRate: 30
ClientConnectionBufferTimeout: 10
ConnectionApproval: 0
ConnectionData:
Expand All @@ -712,7 +709,6 @@ MonoBehaviour:
NetworkIdRecycleDelay: 120
RpcHashSize: 0
LoadSceneTimeOut: 120
EnableMessageBuffering: 1
MessageBufferTimeout: 20
EnableNetworkLogs: 1
--- !u!4 &1211923376
Expand Down Expand Up @@ -869,9 +865,9 @@ MonoBehaviour:
ServerWebsocketListenPort: 8887
SupportWebsocket: 0
Channels: []
UseMLAPIRelay: 0
MLAPIRelayAddress: 184.72.104.138
MLAPIRelayPort: 8888
UseNetcodeRelay: 0
NetcodeRelayAddress: 127.0.0.1
NetcodeRelayPort: 8888
MessageSendMode: 0
--- !u!1 &2027640071
GameObject:
Expand Down
Loading