Skip to content

Commit f8ac975

Browse files
Merge pull request #301 from Unity-Technologies/netcodeSamples-update-after-1-9-0-release
Updating NetcodeSamples to latest version after N4Ev1.9.0 release
2 parents ed4f9a5 + 6b34ac4 commit f8ac975

File tree

180 files changed

+5295
-7901
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+5295
-7901
lines changed

NetcodeSamples/Assets/Samples/Asteroids/Asteroid.prefab

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ Transform:
3131
m_PrefabInstance: {fileID: 0}
3232
m_PrefabAsset: {fileID: 0}
3333
m_GameObject: {fileID: 1179405006722280534}
34+
serializedVersion: 2
3435
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3536
m_LocalPosition: {x: 0, y: 0, z: 0}
3637
m_LocalScale: {x: 30, y: 30, z: 30}
3738
m_ConstrainProportionsScale: 0
3839
m_Children: []
3940
m_Father: {fileID: 0}
40-
m_RootOrder: 0
4141
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4242
--- !u!114 &2472327286752606328
4343
MonoBehaviour:
@@ -54,13 +54,16 @@ MonoBehaviour:
5454
DefaultGhostMode: 0
5555
SupportedGhostModes: 3
5656
OptimizationMode: 0
57-
Importance: 1
57+
Importance: 5
58+
MaxSendRate: 10
5859
prefabId: 22681d06f3b7a4c5a999a7a7aa16bd15
5960
HasOwner: 0
6061
SupportAutoCommandTarget: 0
6162
TrackInterpolationDelay: 0
6263
GhostGroup: 0
6364
UsePreSerialization: 0
65+
RollbackPredictedSpawnedGhostState: 0
66+
RollbackPredictionOnStructuralChanges: 1
6467
--- !u!114 &3551607053619548655
6568
MonoBehaviour:
6669
m_ObjectHideFlags: 0

NetcodeSamples/Assets/Samples/Asteroids/Asteroids.unity

Lines changed: 12 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 10
16+
serializedVersion: 9
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -38,12 +38,12 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
4645
serializedVersion: 12
46+
m_GIWorkflowMode: 1
4747
m_GISettings:
4848
serializedVersion: 2
4949
m_BounceScale: 1
@@ -66,6 +66,9 @@ LightmapSettings:
6666
m_LightmapParameters: {fileID: 0}
6767
m_LightmapsBakeMode: 1
6868
m_TextureCompression: 1
69+
m_FinalGather: 0
70+
m_FinalGatherFiltering: 1
71+
m_FinalGatherRayCount: 256
6972
m_ReflectionCompression: 2
7073
m_MixedBakeMode: 2
7174
m_BakeBackend: 0
@@ -94,7 +97,7 @@ LightmapSettings:
9497
m_TrainingDataDestination: TrainingData
9598
m_LightProbeSampleCountMultiplier: 4
9699
m_LightingDataAsset: {fileID: 0}
97-
m_LightingSettings: {fileID: 1747551238}
100+
m_LightingSettings: {fileID: 0}
98101
--- !u!196 &4
99102
NavMeshSettings:
100103
serializedVersion: 2
@@ -769,59 +772,6 @@ Transform:
769772
m_Children: []
770773
m_Father: {fileID: 0}
771774
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
772-
--- !u!1 &988581075
773-
GameObject:
774-
m_ObjectHideFlags: 0
775-
m_CorrespondingSourceObject: {fileID: 0}
776-
m_PrefabInstance: {fileID: 0}
777-
m_PrefabAsset: {fileID: 0}
778-
serializedVersion: 6
779-
m_Component:
780-
- component: {fileID: 988581077}
781-
- component: {fileID: 988581076}
782-
m_Layer: 0
783-
m_Name: Prespawn
784-
m_TagString: Untagged
785-
m_Icon: {fileID: 0}
786-
m_NavMeshLayer: 0
787-
m_StaticEditorFlags: 0
788-
m_IsActive: 1
789-
--- !u!114 &988581076
790-
MonoBehaviour:
791-
m_ObjectHideFlags: 0
792-
m_CorrespondingSourceObject: {fileID: 0}
793-
m_PrefabInstance: {fileID: 0}
794-
m_PrefabAsset: {fileID: 0}
795-
m_GameObject: {fileID: 988581075}
796-
m_Enabled: 1
797-
m_EditorHideFlags: 0
798-
m_Script: {fileID: 11500000, guid: 45a335734b1572644a6a5d09d87adc65, type: 3}
799-
m_Name:
800-
m_EditorClassIdentifier:
801-
_SceneAsset: {fileID: 102900000, guid: 3a69492cdc6f643b6aa2da83a54ac358, type: 3}
802-
_HierarchyColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
803-
AutoLoadScene: 1
804-
_SceneGUID:
805-
Value:
806-
x: 3264517795
807-
y: 3007772365
808-
z: 950872742
809-
w: 2235343962
810-
--- !u!4 &988581077
811-
Transform:
812-
m_ObjectHideFlags: 0
813-
m_CorrespondingSourceObject: {fileID: 0}
814-
m_PrefabInstance: {fileID: 0}
815-
m_PrefabAsset: {fileID: 0}
816-
m_GameObject: {fileID: 988581075}
817-
serializedVersion: 2
818-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
819-
m_LocalPosition: {x: 0, y: 0, z: 0}
820-
m_LocalScale: {x: 1, y: 1, z: 1}
821-
m_ConstrainProportionsScale: 0
822-
m_Children: []
823-
m_Father: {fileID: 0}
824-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
825775
--- !u!1 &989938675
826776
GameObject:
827777
m_ObjectHideFlags: 0
@@ -1207,12 +1157,12 @@ MonoBehaviour:
12071157
m_RequiresColorTexture: 0
12081158
m_Version: 2
12091159
m_TaaSettings:
1210-
quality: 3
1211-
frameInfluence: 0.1
1212-
jitterScale: 1
1213-
mipBias: 0
1214-
varianceClampScale: 0.9
1215-
contrastAdaptiveSharpening: 0
1160+
m_Quality: 3
1161+
m_FrameInfluence: 0.1
1162+
m_JitterScale: 1
1163+
m_MipBias: 0
1164+
m_VarianceClampScale: 0.9
1165+
m_ContrastAdaptiveSharpening: 0
12161166
--- !u!1 &1400442228
12171167
GameObject:
12181168
m_ObjectHideFlags: 0
@@ -1372,66 +1322,6 @@ RectTransform:
13721322
m_AnchoredPosition: {x: 0, y: 0}
13731323
m_SizeDelta: {x: 0, y: 0}
13741324
m_Pivot: {x: 0, y: 0}
1375-
--- !u!850595691 &1747551238
1376-
LightingSettings:
1377-
m_ObjectHideFlags: 0
1378-
m_CorrespondingSourceObject: {fileID: 0}
1379-
m_PrefabInstance: {fileID: 0}
1380-
m_PrefabAsset: {fileID: 0}
1381-
m_Name: Settings.lighting
1382-
serializedVersion: 8
1383-
m_EnableBakedLightmaps: 0
1384-
m_EnableRealtimeLightmaps: 0
1385-
m_RealtimeEnvironmentLighting: 1
1386-
m_BounceScale: 1
1387-
m_AlbedoBoost: 1
1388-
m_IndirectOutputScale: 1
1389-
m_UsingShadowmask: 1
1390-
m_BakeBackend: 1
1391-
m_LightmapMaxSize: 1024
1392-
m_LightmapSizeFixed: 0
1393-
m_UseMipmapLimits: 1
1394-
m_BakeResolution: 40
1395-
m_Padding: 2
1396-
m_LightmapCompression: 3
1397-
m_AO: 0
1398-
m_AOMaxDistance: 1
1399-
m_CompAOExponent: 1
1400-
m_CompAOExponentDirect: 0
1401-
m_ExtractAO: 0
1402-
m_MixedBakeMode: 2
1403-
m_LightmapsBakeMode: 1
1404-
m_FilterMode: 1
1405-
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
1406-
m_ExportTrainingData: 0
1407-
m_TrainingDataDestination: TrainingData
1408-
m_RealtimeResolution: 2
1409-
m_ForceWhiteAlbedo: 0
1410-
m_ForceUpdates: 0
1411-
m_PVRCulling: 1
1412-
m_PVRSampling: 1
1413-
m_PVRDirectSampleCount: 32
1414-
m_PVRSampleCount: 512
1415-
m_PVREnvironmentSampleCount: 512
1416-
m_PVREnvironmentReferencePointCount: 2048
1417-
m_LightProbeSampleCountMultiplier: 4
1418-
m_PVRBounces: 2
1419-
m_PVRMinBounces: 2
1420-
m_PVREnvironmentImportanceSampling: 0
1421-
m_PVRFilteringMode: 2
1422-
m_PVRDenoiserTypeDirect: 0
1423-
m_PVRDenoiserTypeIndirect: 0
1424-
m_PVRDenoiserTypeAO: 0
1425-
m_PVRFilterTypeDirect: 0
1426-
m_PVRFilterTypeIndirect: 0
1427-
m_PVRFilterTypeAO: 0
1428-
m_PVRFilteringGaussRadiusDirect: 1
1429-
m_PVRFilteringGaussRadiusIndirect: 5
1430-
m_PVRFilteringGaussRadiusAO: 2
1431-
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
1432-
m_PVRFilteringAtrousPositionSigmaIndirect: 2
1433-
m_PVRFilteringAtrousPositionSigmaAO: 1
1434-
m_RespectSceneVisibilityWhenBakingGI: 0
14351325
--- !u!1 &1893564307
14361326
GameObject:
14371327
m_ObjectHideFlags: 0
@@ -1685,4 +1575,3 @@ SceneRoots:
16851575
- {fileID: 1400442230}
16861576
- {fileID: 1607068897}
16871577
- {fileID: 610662979}
1688-
- {fileID: 988581077}

0 commit comments

Comments
 (0)