diff --git a/.yamato/project.metafile b/.yamato/project.metafile index b87b29b15..13ebe1e26 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -26,7 +26,7 @@ projects: - name: clientdriven path: Basic/ClientDriven test_editors: - - 2022.3 + - 6000.0 run_editor_tests: !!bool false run_playmode_tests: !!bool false test_filter: diff --git a/Basic/ClientDriven/Assets/DefaultVolumeProfile.asset b/Basic/ClientDriven/Assets/DefaultVolumeProfile.asset new file mode 100644 index 000000000..ed2ac76b0 --- /dev/null +++ b/Basic/ClientDriven/Assets/DefaultVolumeProfile.asset @@ -0,0 +1,795 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8548253659598136236 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c5e1dc532bcb41949b58bc4f2abfbb7e, type: 3} + m_Name: LensDistortion + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0 + xMultiplier: + m_OverrideState: 1 + m_Value: 1 + yMultiplier: + m_OverrideState: 1 + m_Value: 1 + center: + m_OverrideState: 1 + m_Value: {x: 0.5, y: 0.5} + scale: + m_OverrideState: 1 + m_Value: 1 +--- !u!114 &-7620722307282057325 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + skipIterations: + m_OverrideState: 1 + m_Value: 1 + threshold: + m_OverrideState: 1 + m_Value: 0.9 + intensity: + m_OverrideState: 1 + m_Value: 0 + scatter: + m_OverrideState: 1 + m_Value: 0.7 + clamp: + m_OverrideState: 1 + m_Value: 65472 + tint: + m_OverrideState: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 1 + m_Value: 0 + downscale: + m_OverrideState: 1 + m_Value: 0 + maxIterations: + m_OverrideState: 1 + m_Value: 6 + dirtTexture: + m_OverrideState: 1 + m_Value: {fileID: 0} + dimension: 1 + dirtIntensity: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-5819151824578459065 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 06437c1ff663d574d9447842ba0a72e4, type: 3} + m_Name: ScreenSpaceLensFlare + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0 + tintColor: + m_OverrideState: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} + bloomMip: + m_OverrideState: 1 + m_Value: 1 + firstFlareIntensity: + m_OverrideState: 1 + m_Value: 1 + secondaryFlareIntensity: + m_OverrideState: 1 + m_Value: 1 + warpedFlareIntensity: + m_OverrideState: 1 + m_Value: 1 + warpedFlareScale: + m_OverrideState: 1 + m_Value: {x: 1, y: 1} + samples: + m_OverrideState: 1 + m_Value: 1 + sampleDimmer: + m_OverrideState: 1 + m_Value: 0.5 + vignetteEffect: + m_OverrideState: 1 + m_Value: 1 + startingPosition: + m_OverrideState: 1 + m_Value: 1.25 + scale: + m_OverrideState: 1 + m_Value: 1.5 + streaksIntensity: + m_OverrideState: 1 + m_Value: 0 + streaksLength: + m_OverrideState: 1 + m_Value: 0.5 + streaksOrientation: + m_OverrideState: 1 + m_Value: 0 + streaksThreshold: + m_OverrideState: 1 + m_Value: 0.25 + resolution: + m_OverrideState: 1 + m_Value: 4 + chromaticAbberationIntensity: + m_OverrideState: 1 + m_Value: 0.5 +--- !u!114 &-5601902770691314992 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6bd486065ce11414fa40e631affc4900, type: 3} + m_Name: ProbeVolumesOptions + m_EditorClassIdentifier: + active: 1 + normalBias: + m_OverrideState: 1 + m_Value: 0.05 + viewBias: + m_OverrideState: 1 + m_Value: 0.1 + scaleBiasWithMinProbeDistance: + m_OverrideState: 1 + m_Value: 0 + samplingNoise: + m_OverrideState: 1 + m_Value: 0.1 + animateSamplingNoise: + m_OverrideState: 1 + m_Value: 1 + leakReductionMode: + m_OverrideState: 1 + m_Value: 2 + minValidDotProductValue: + m_OverrideState: 1 + m_Value: 0.1 + occlusionOnlyReflectionNormalization: + m_OverrideState: 1 + m_Value: 1 + intensityMultiplier: + m_OverrideState: 1 + m_Value: 1 + skyOcclusionIntensityMultiplier: + m_OverrideState: 1 + m_Value: 1 + worldOffset: + m_OverrideState: 1 + m_Value: {x: 0, y: 0, z: 0} +--- !u!114 &-4331837873203555767 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e021b4c809a781e468c2988c016ebbea, type: 3} + m_Name: ColorLookup + m_EditorClassIdentifier: + active: 1 + texture: + m_OverrideState: 1 + m_Value: {fileID: 0} + dimension: 1 + contribution: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-4137296179184560915 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29fa0085f50d5e54f8144f766051a691, type: 3} + m_Name: FilmGrain + m_EditorClassIdentifier: + active: 1 + type: + m_OverrideState: 1 + m_Value: 0 + intensity: + m_OverrideState: 1 + m_Value: 0 + response: + m_OverrideState: 1 + m_Value: 0.8 + texture: + m_OverrideState: 1 + m_Value: {fileID: 0} +--- !u!114 &-2678046779415896613 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cdfbdbb87d3286943a057f7791b43141, type: 3} + m_Name: ChannelMixer + m_EditorClassIdentifier: + active: 1 + redOutRedIn: + m_OverrideState: 1 + m_Value: 100 + redOutGreenIn: + m_OverrideState: 1 + m_Value: 0 + redOutBlueIn: + m_OverrideState: 1 + m_Value: 0 + greenOutRedIn: + m_OverrideState: 1 + m_Value: 0 + greenOutGreenIn: + m_OverrideState: 1 + m_Value: 100 + greenOutBlueIn: + m_OverrideState: 1 + m_Value: 0 + blueOutRedIn: + m_OverrideState: 1 + m_Value: 0 + blueOutGreenIn: + m_OverrideState: 1 + m_Value: 0 + blueOutBlueIn: + m_OverrideState: 1 + m_Value: 100 +--- !u!114 &-1865508968841873984 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81180773991d8724ab7f2d216912b564, type: 3} + m_Name: ChromaticAberration + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-1116097384360349658 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 221518ef91623a7438a71fef23660601, type: 3} + m_Name: WhiteBalance + m_EditorClassIdentifier: + active: 1 + temperature: + m_OverrideState: 1 + m_Value: 0 + tint: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &-434664689840302925 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3eb4b772797da9440885e8bd939e9560, type: 3} + m_Name: ColorCurves + m_EditorClassIdentifier: + active: 1 + master: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + red: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + green: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + blue: + m_OverrideState: 1 + m_Value: + k__BackingField: 2 + m_Loop: 0 + m_ZeroValue: 0 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + hueVsHue: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 1 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + hueVsSat: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 1 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + satVsSat: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 0 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + lumVsSat: + m_OverrideState: 1 + m_Value: + k__BackingField: 0 + m_Loop: 0 + m_ZeroValue: 0.5 + m_Range: 1 + m_Curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: DefaultVolumeProfile + m_EditorClassIdentifier: + components: + - {fileID: -1865508968841873984} + - {fileID: -4331837873203555767} + - {fileID: -1116097384360349658} + - {fileID: 7985776519292136752} + - {fileID: 7557341562264617441} + - {fileID: 1219293528110580212} + - {fileID: 1024477193827822369} + - {fileID: 8346766252800741107} + - {fileID: 7304194387179081955} + - {fileID: -2678046779415896613} + - {fileID: 2587207886129537186} + - {fileID: -7620722307282057325} + - {fileID: -434664689840302925} + - {fileID: 7639818343918997526} + - {fileID: -4137296179184560915} + - {fileID: -8548253659598136236} + - {fileID: -5819151824578459065} + - {fileID: 8305828074638587898} + - {fileID: -5601902770691314992} +--- !u!114 &1024477193827822369 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 0 + gaussianStart: + m_OverrideState: 1 + m_Value: 10 + gaussianEnd: + m_OverrideState: 1 + m_Value: 30 + gaussianMaxRadius: + m_OverrideState: 1 + m_Value: 1 + highQualitySampling: + m_OverrideState: 1 + m_Value: 0 + focusDistance: + m_OverrideState: 1 + m_Value: 10 + aperture: + m_OverrideState: 1 + m_Value: 5.6 + focalLength: + m_OverrideState: 1 + m_Value: 50 + bladeCount: + m_OverrideState: 1 + m_Value: 5 + bladeCurvature: + m_OverrideState: 1 + m_Value: 1 + bladeRotation: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &1219293528110580212 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 558a8e2b6826cf840aae193990ba9f2e, type: 3} + m_Name: ShadowsMidtonesHighlights + m_EditorClassIdentifier: + active: 1 + shadows: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + midtones: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + highlights: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + shadowsStart: + m_OverrideState: 1 + m_Value: 0 + shadowsEnd: + m_OverrideState: 1 + m_Value: 0.3 + highlightsStart: + m_OverrideState: 1 + m_Value: 0.55 + highlightsEnd: + m_OverrideState: 1 + m_Value: 1 +--- !u!114 &2587207886129537186 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5485954d14dfb9a4c8ead8edb0ded5b1, type: 3} + m_Name: LiftGammaGain + m_EditorClassIdentifier: + active: 1 + lift: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + gamma: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} + gain: + m_OverrideState: 1 + m_Value: {x: 1, y: 1, z: 1, w: 0} +--- !u!114 &7304194387179081955 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: + active: 1 + color: + m_OverrideState: 1 + m_Value: {r: 0, g: 0, b: 0, a: 1} + center: + m_OverrideState: 1 + m_Value: {x: 0.5, y: 0.5} + intensity: + m_OverrideState: 1 + m_Value: 0 + smoothness: + m_OverrideState: 1 + m_Value: 0.2 + rounded: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &7557341562264617441 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3} + m_Name: Tonemapping + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 0 + neutralHDRRangeReductionMode: + m_OverrideState: 1 + m_Value: 2 + acesPreset: + m_OverrideState: 1 + m_Value: 3 + hueShiftAmount: + m_OverrideState: 1 + m_Value: 0 + detectPaperWhite: + m_OverrideState: 1 + m_Value: 0 + paperWhite: + m_OverrideState: 1 + m_Value: 300 + detectBrightnessLimits: + m_OverrideState: 1 + m_Value: 1 + minNits: + m_OverrideState: 1 + m_Value: 0.005 + maxNits: + m_OverrideState: 1 + m_Value: 1000 +--- !u!114 &7639818343918997526 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb60a22f311433c4c962b888d1393f88, type: 3} + m_Name: PaniniProjection + m_EditorClassIdentifier: + active: 1 + distance: + m_OverrideState: 1 + m_Value: 0 + cropToFit: + m_OverrideState: 1 + m_Value: 1 +--- !u!114 &7985776519292136752 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccf1aba9553839d41ae37dd52e9ebcce, type: 3} + m_Name: MotionBlur + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 0 + quality: + m_OverrideState: 1 + m_Value: 0 + intensity: + m_OverrideState: 1 + m_Value: 0 + clamp: + m_OverrideState: 1 + m_Value: 0.05 +--- !u!114 &8305828074638587898 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70afe9e12c7a7ed47911bb608a23a8ff, type: 3} + m_Name: SplitToning + m_EditorClassIdentifier: + active: 1 + shadows: + m_OverrideState: 1 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + highlights: + m_OverrideState: 1 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + balance: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &8346766252800741107 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66f335fb1ffd8684294ad653bf1c7564, type: 3} + m_Name: ColorAdjustments + m_EditorClassIdentifier: + active: 1 + postExposure: + m_OverrideState: 1 + m_Value: 0 + contrast: + m_OverrideState: 1 + m_Value: 0 + colorFilter: + m_OverrideState: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hueShift: + m_OverrideState: 1 + m_Value: 0 + saturation: + m_OverrideState: 1 + m_Value: 0 diff --git a/Basic/ClientDriven/Assets/DefaultVolumeProfile.asset.meta b/Basic/ClientDriven/Assets/DefaultVolumeProfile.asset.meta new file mode 100644 index 000000000..d89d941b1 --- /dev/null +++ b/Basic/ClientDriven/Assets/DefaultVolumeProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 72f4d754eda3cbe488e53500b4baf088 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basic/ClientDriven/Assets/Materials/Black.mat b/Basic/ClientDriven/Assets/Materials/Black.mat index 373d3ce26..066b54f9d 100644 --- a/Basic/ClientDriven/Assets/Materials/Black.mat +++ b/Basic/ClientDriven/Assets/Materials/Black.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -113,6 +114,7 @@ Material: - _Color: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3872489350039127740 MonoBehaviour: m_ObjectHideFlags: 11 @@ -125,4 +127,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/Materials/DarkGray.mat b/Basic/ClientDriven/Assets/Materials/DarkGray.mat index 3f9990354..ad3618518 100644 --- a/Basic/ClientDriven/Assets/Materials/DarkGray.mat +++ b/Basic/ClientDriven/Assets/Materials/DarkGray.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -113,6 +114,7 @@ Material: - _Color: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3872489350039127740 MonoBehaviour: m_ObjectHideFlags: 11 @@ -125,4 +127,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/Materials/DarkGray_02.mat b/Basic/ClientDriven/Assets/Materials/DarkGray_02.mat index 55c173e88..887e16fd1 100644 --- a/Basic/ClientDriven/Assets/Materials/DarkGray_02.mat +++ b/Basic/ClientDriven/Assets/Materials/DarkGray_02.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -113,6 +114,7 @@ Material: - _Color: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3872489350039127740 MonoBehaviour: m_ObjectHideFlags: 11 @@ -125,4 +127,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/Materials/Gradient.mat b/Basic/ClientDriven/Assets/Materials/Gradient.mat index 79f554568..2e350b358 100644 --- a/Basic/ClientDriven/Assets/Materials/Gradient.mat +++ b/Basic/ClientDriven/Assets/Materials/Gradient.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -31,7 +31,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -196,3 +197,4 @@ Material: - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _Tiling_and_Offset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/Materials/Gray.mat b/Basic/ClientDriven/Assets/Materials/Gray.mat index f5786f6da..e7802e179 100644 --- a/Basic/ClientDriven/Assets/Materials/Gray.mat +++ b/Basic/ClientDriven/Assets/Materials/Gray.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -125,6 +126,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6087303183906255408 MonoBehaviour: m_ObjectHideFlags: 11 @@ -137,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/Materials/Gray_02.mat b/Basic/ClientDriven/Assets/Materials/Gray_02.mat index 3f1b802df..4ff45e992 100644 --- a/Basic/ClientDriven/Assets/Materials/Gray_02.mat +++ b/Basic/ClientDriven/Assets/Materials/Gray_02.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -125,6 +126,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6087303183906255408 MonoBehaviour: m_ObjectHideFlags: 11 @@ -137,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/Materials/GridDark.mat b/Basic/ClientDriven/Assets/Materials/GridDark.mat index 0e7c1b7e0..17a7b5451 100644 --- a/Basic/ClientDriven/Assets/Materials/GridDark.mat +++ b/Basic/ClientDriven/Assets/Materials/GridDark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -31,7 +31,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -191,3 +192,4 @@ Material: - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _Tiling_and_Offset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/Materials/GridDarkest.mat b/Basic/ClientDriven/Assets/Materials/GridDarkest.mat index 4d7cf7a8e..0ba79e126 100644 --- a/Basic/ClientDriven/Assets/Materials/GridDarkest.mat +++ b/Basic/ClientDriven/Assets/Materials/GridDarkest.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -31,7 +31,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -191,3 +192,4 @@ Material: - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _Tiling_and_Offset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/Materials/GridLight.mat b/Basic/ClientDriven/Assets/Materials/GridLight.mat index 8aaf0ce8c..8ca7b5838 100644 --- a/Basic/ClientDriven/Assets/Materials/GridLight.mat +++ b/Basic/ClientDriven/Assets/Materials/GridLight.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -31,7 +31,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -191,3 +192,4 @@ Material: - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _Tiling_and_Offset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/Materials/GridMed.mat b/Basic/ClientDriven/Assets/Materials/GridMed.mat index 527b958f1..249dbef42 100644 --- a/Basic/ClientDriven/Assets/Materials/GridMed.mat +++ b/Basic/ClientDriven/Assets/Materials/GridMed.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -31,7 +31,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -191,3 +192,4 @@ Material: - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _Tiling_and_Offset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/Materials/PickupBlue.mat b/Basic/ClientDriven/Assets/Materials/PickupBlue.mat index b4695726a..8d88e2354 100644 --- a/Basic/ClientDriven/Assets/Materials/PickupBlue.mat +++ b/Basic/ClientDriven/Assets/Materials/PickupBlue.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -37,6 +37,7 @@ Material: RenderType: Transparent disabledShaderPasses: - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -135,3 +136,4 @@ Material: - _Fresnel_Color: {r: 0, g: 0.29999995, b: 1, a: 1} - _Main_Pickup_Color: {r: 0.02352941, g: 0.33923388, b: 1, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/Materials/PickupPurple.mat b/Basic/ClientDriven/Assets/Materials/PickupPurple.mat index a9180855e..460332663 100644 --- a/Basic/ClientDriven/Assets/Materials/PickupPurple.mat +++ b/Basic/ClientDriven/Assets/Materials/PickupPurple.mat @@ -24,6 +24,7 @@ Material: RenderType: Transparent disabledShaderPasses: - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -122,6 +123,7 @@ Material: - _Fresnel_Color: {r: 0.16933, g: 0.16933, b: 0.41, a: 0} - _Main_Pickup_Color: {r: 0.4465828, g: 0.39582747, b: 0.5803922, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4439061200948001316 MonoBehaviour: m_ObjectHideFlags: 11 @@ -134,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/Materials/PickupRed.mat b/Basic/ClientDriven/Assets/Materials/PickupRed.mat index e8e51682e..0124ee627 100644 --- a/Basic/ClientDriven/Assets/Materials/PickupRed.mat +++ b/Basic/ClientDriven/Assets/Materials/PickupRed.mat @@ -24,6 +24,7 @@ Material: RenderType: Transparent disabledShaderPasses: - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -122,6 +123,7 @@ Material: - _Fresnel_Color: {r: 0.4745098, g: 0, b: 0.2570247, a: 1} - _Main_Pickup_Color: {r: 0.6156863, g: 0, b: 0.24826066, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2715421772106534400 MonoBehaviour: m_ObjectHideFlags: 11 @@ -134,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/Materials/White.mat b/Basic/ClientDriven/Assets/Materials/White.mat index 5df513bf3..993af24fb 100644 --- a/Basic/ClientDriven/Assets/Materials/White.mat +++ b/Basic/ClientDriven/Assets/Materials/White.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -125,6 +126,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6087303183906255408 MonoBehaviour: m_ObjectHideFlags: 11 @@ -137,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/Materials/White_02.mat b/Basic/ClientDriven/Assets/Materials/White_02.mat index ec5df39dc..3a6c6248a 100644 --- a/Basic/ClientDriven/Assets/Materials/White_02.mat +++ b/Basic/ClientDriven/Assets/Materials/White_02.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -125,6 +126,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6087303183906255408 MonoBehaviour: m_ObjectHideFlags: 11 @@ -137,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/Materials/Yellow.mat b/Basic/ClientDriven/Assets/Materials/Yellow.mat index 254920a7b..d2c9428a1 100644 --- a/Basic/ClientDriven/Assets/Materials/Yellow.mat +++ b/Basic/ClientDriven/Assets/Materials/Yellow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -126,3 +127,4 @@ Material: - _Color: {r: 1, g: 0.9470247, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity index dd474bd17..8fe4d7f92 100644 --- a/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity +++ b/Basic/ClientDriven/Assets/Scenes/Bootstrap.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 1 m_FogColor: {r: 0.9093371, g: 0.228102, b: 0.99607843, a: 1} m_FogMode: 1 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.21890238, g: 0.16790517, b: 0.6703396, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -679,6 +675,7 @@ MonoBehaviour: m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 --- !u!1 &1114774665 GameObject: m_ObjectHideFlags: 0 @@ -710,6 +707,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ProtocolType: 0 + m_UseWebSockets: 0 + m_UseEncryption: 0 m_MaxPacketQueueSize: 256 m_MaxPayloadSize: 6144 m_HeartbeatTimeoutMS: 500 @@ -736,6 +735,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3} m_Name: m_EditorClassIdentifier: + NetworkManagerExpanded: 0 NetworkConfig: ProtocolVersion: 0 NetworkTransport: {fileID: 1114774666} @@ -758,6 +758,11 @@ MonoBehaviour: LoadSceneTimeOut: 120 SpawnTimeout: 1 EnableNetworkLogs: 1 + NetworkTopology: 0 + UseCMBService: 0 + AutoSpawnPlayerPrefabClientSide: 1 + NetworkMessageMetrics: 1 + NetworkProfilingMetrics: 1 OldPrefabList: [] RunInBackground: 1 LogLevel: 1 @@ -825,9 +830,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265101692} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 @@ -877,8 +881,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &1265101695 Transform: m_ObjectHideFlags: 0 @@ -926,6 +934,8 @@ MonoBehaviour: m_EditorClassIdentifier: GlobalObjectIdHash: 2084257867 InScenePlacedSourceGlobalObjectIdHash: 0 + DeferredDespawnTick: 0 + Ownership: 1 AlwaysReplicateAsRoot: 0 SynchronizeTransform: 1 ActiveSceneSynchronization: 0 @@ -933,6 +943,8 @@ MonoBehaviour: SpawnWithObservers: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 + SyncOwnerTransformWhenParented: 1 + AllowOwnerToParent: 0 --- !u!114 &1299635455 MonoBehaviour: m_ObjectHideFlags: 0 @@ -945,6 +957,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4a63eee89507d4567ba9942e8d3b72ef, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 --- !u!4 &1299635456 Transform: m_ObjectHideFlags: 0 @@ -1043,7 +1056,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2070925441746177913, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} + - {fileID: 302414353685223452, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -1527,6 +1542,8 @@ MonoBehaviour: m_EditorClassIdentifier: GlobalObjectIdHash: 1374255023 InScenePlacedSourceGlobalObjectIdHash: 0 + DeferredDespawnTick: 0 + Ownership: 1 AlwaysReplicateAsRoot: 0 SynchronizeTransform: 1 ActiveSceneSynchronization: 0 @@ -1534,6 +1551,8 @@ MonoBehaviour: SpawnWithObservers: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 + SyncOwnerTransformWhenParented: 1 + AllowOwnerToParent: 0 --- !u!114 &2060465723 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1546,6 +1565,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0e9fc72e2127848029b1e484d42a87db, type: 3} m_Name: m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 m_SpawnPoints: - {fileID: 1675346221} - {fileID: 406937058} @@ -1590,7 +1610,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 330446108134725129, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 80a1e6a5d1689444c8e2994a51639e98, type: 2} - target: {fileID: 330446108437876620, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} @@ -1598,7 +1618,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 330446108437876620, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 80a1e6a5d1689444c8e2994a51639e98, type: 2} - target: {fileID: 330446108483632075, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} @@ -1606,7 +1626,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 330446108483632075, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 80a1e6a5d1689444c8e2994a51639e98, type: 2} - target: {fileID: 330446108483632077, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} @@ -1618,7 +1638,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 330446108483864580, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 80a1e6a5d1689444c8e2994a51639e98, type: 2} - target: {fileID: 330446108491112687, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} @@ -1626,7 +1646,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 330446108491112687, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 80a1e6a5d1689444c8e2994a51639e98, type: 2} - target: {fileID: 330446108690218393, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} @@ -1678,7 +1698,7 @@ PrefabInstance: value: LevelGeometry objectReference: {fileID: 0} - target: {fileID: 330446108890523300, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 60d6e855c545d5346a46836036c89493, type: 2} - target: {fileID: 330446108928372035, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} @@ -1698,7 +1718,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 330446109676110357, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 80a1e6a5d1689444c8e2994a51639e98, type: 2} - target: {fileID: 330446109869347218, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} @@ -1710,7 +1730,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 330446109950005816, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 80a1e6a5d1689444c8e2994a51639e98, type: 2} - target: {fileID: 351538546967969878, guid: d793abe7ff9aa094eb534e73a82fdab5, type: 3} diff --git a/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs b/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs index 30c15cde5..7bf1e8930 100644 --- a/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs +++ b/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs @@ -1,6 +1,6 @@ using System; -using Cinemachine; using StarterAssets; +using Unity.Cinemachine; using Unity.Netcode; using UnityEngine; using UnityEngine.InputSystem; @@ -69,7 +69,7 @@ public override void OnNetworkSpawn() // position on owning clients m_CharacterController.enabled = true; - var cinemachineVirtualCamera = FindObjectOfType(); + var cinemachineVirtualCamera = FindFirstObjectByType(); cinemachineVirtualCamera.Follow = m_CameraFollow; } diff --git a/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs b/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs index 70b2e0c71..4b00875a5 100644 --- a/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs +++ b/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs @@ -14,7 +14,7 @@ public static ServerPlayerSpawnPoints Instance { if (s_Instance == null) { - s_Instance = FindObjectOfType(); + s_Instance = FindFirstObjectByType(); } return s_Instance; diff --git a/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs b/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs index b0a1516de..cfd52300a 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs +++ b/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs @@ -4,7 +4,7 @@ using UnityEngine; using Object = UnityEngine.Object; #if STARTER_ASSETS_PACKAGES_CHECKED -using Cinemachine; +using Unity.Cinemachine; #endif namespace StarterAssets @@ -47,7 +47,7 @@ private static void CheckCameras(Transform targetParent, string prefabFolder) if (!vcam) { - if (TryLocatePrefab(CinemachineVirtualCameraName, new string[] { prefabFolder }, new[] { typeof(CinemachineVirtualCamera) }, out GameObject vcamPrefab, out string _)) + if (TryLocatePrefab(CinemachineVirtualCameraName, new string[] { prefabFolder }, new[] { typeof(CinemachineCamera) }, out GameObject vcamPrefab, out string _)) { HandleInstantiatingPrefab(vcamPrefab, out vcam); _cinemachineVirtualCamera = vcam; @@ -114,7 +114,7 @@ private static void CheckVirtualCameraFollowReference(GameObject target, GameObject cinemachineVirtualCamera) { var serializedObject = - new SerializedObject(cinemachineVirtualCamera.GetComponent()); + new SerializedObject(cinemachineVirtualCamera.GetComponent()); var serializedProperty = serializedObject.FindProperty("m_Follow"); serializedProperty.objectReferenceValue = target.transform; serializedObject.ApplyModifiedProperties(); diff --git a/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs b/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs index 58c8b96d5..9d8ae8900 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs +++ b/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs @@ -17,7 +17,7 @@ public partial class StarterAssetsDeployMenu : ScriptableObject [MenuItem(MenuRoot + "/Reset Third Person Controller Armature", false)] static void ResetThirdPersonControllerArmature() { - var thirdPersonControllers = FindObjectsOfType(); + var thirdPersonControllers = FindObjectsByType(FindObjectsSortMode.None); ThirdPersonController player = null; foreach (var controller in thirdPersonControllers) @@ -58,7 +58,7 @@ static void ResetThirdPersonControllerArmature() [MenuItem(MenuRoot + "/Reset Third Person Controller Capsule", false)] static void ResetThirdPersonControllerCapsule() { - var thirdPersonControllers = FindObjectsOfType(); + var thirdPersonControllers = FindObjectsByType(FindObjectsSortMode.None); ThirdPersonController player = null; foreach (var controller in thirdPersonControllers) diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Blue_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Blue_Mat.mat index 070c6df72..8d63a4b87 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Blue_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Blue_Mat.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -120,6 +121,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7018707826221112663 MonoBehaviour: m_ObjectHideFlags: 11 @@ -132,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Built-in_RP/BuiltInTriplanar_01_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Built-in_RP/BuiltInTriplanar_01_Mat.mat index d83b69a27..9c85d1890 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Built-in_RP/BuiltInTriplanar_01_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Built-in_RP/BuiltInTriplanar_01_Mat.mat @@ -18,7 +18,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -118,6 +119,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5007688603366988852 MonoBehaviour: m_ObjectHideFlags: 11 @@ -130,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GreyBlue_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GreyBlue_Mat.mat index f17121bed..04018e56f 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GreyBlue_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GreyBlue_Mat.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -113,6 +114,7 @@ Material: - _Color: {r: 0.5110952, g: 0.62652487, b: 0.6886792, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8979068133528433188 MonoBehaviour: m_ObjectHideFlags: 11 @@ -125,4 +127,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridBlue_01_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridBlue_01_Mat.mat index 018cf6444..6365e5027 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridBlue_01_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridBlue_01_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -31,7 +31,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -153,3 +154,4 @@ Material: - _Emissive_Color: {r: 0.76666665, g: 1, b: 0, a: 1} - _Tiling_and_Offset: {r: 17, g: 17, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridOrange_01_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridOrange_01_Mat.mat index 429945096..1419610d8 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridOrange_01_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridOrange_01_Mat.mat @@ -18,7 +18,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -139,6 +140,7 @@ Material: - _Emissive_Color: {r: 0, g: 0, b: 0, a: 0} - _Tiling_and_Offset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2303944024551249120 MonoBehaviour: m_ObjectHideFlags: 11 @@ -151,4 +153,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridWhite_01_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridWhite_01_Mat.mat index 7482e026a..3472b6462 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridWhite_01_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridWhite_01_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -34,7 +34,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -135,3 +136,4 @@ Material: - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat index 5161ac9b8..3f9578884 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat @@ -18,7 +18,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -119,6 +120,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6450197988115792188 MonoBehaviour: m_ObjectHideFlags: 11 @@ -131,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Arms.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Arms.mat index 20ca07cd3..bb37e9bfa 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Arms.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Arms.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -33,7 +33,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -154,3 +155,4 @@ Material: - _Layer2Color: {r: 0.6132076, g: 0.6132076, b: 0.6132076, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Body.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Body.mat index ef94ceb97..1fb2e017f 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Body.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Body.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -33,7 +33,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -154,3 +155,4 @@ Material: - _Layer2Color: {r: 0.9622642, g: 0.72418696, b: 0.43120328, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Legs.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Legs.mat index c73f3304e..910a59ba3 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Legs.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Legs.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -33,7 +33,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -154,3 +155,4 @@ Material: - _Layer2Color: {r: 0.6132076, g: 0.6132076, b: 0.6132076, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Arms.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Arms.mat index 3252ea075..57a242f93 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Arms.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Arms.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -34,7 +34,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -194,3 +195,4 @@ Material: - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - _Vector4: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Body.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Body.mat index e5b8682cc..25d8cb700 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Body.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Body.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -34,7 +34,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -194,3 +195,4 @@ Material: - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - _Vector4: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Legs.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Legs.mat index fdefe9188..9a618f113 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Legs.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Legs.mat @@ -21,7 +21,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -181,6 +182,7 @@ Material: - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - _Vector4: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &939474612544927401 MonoBehaviour: m_ObjectHideFlags: 11 @@ -193,4 +195,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/NestedParentArmature_Unpack.prefab b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/NestedParentArmature_Unpack.prefab index fb39df54e..ee3e1d028 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/NestedParentArmature_Unpack.prefab +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/NestedParentArmature_Unpack.prefab @@ -23,9 +23,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8047161636021232021} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.92999995, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5542111180780342647} - {fileID: 3203261902030644824} @@ -33,96 +35,83 @@ Transform: - {fileID: 4072154296131656415} - {fileID: 6858111992258843779} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3515378425540693942 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2119775930974504096} m_Modifications: - - target: {fileID: 1992104595683069851, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 1992104595683069851, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_Name value: UI_EventSystem objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalScale.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalPosition.y value: -0.92999995 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f0271df749728104eac22c3d897fd8ce, type: 3} --- !u!4 &6858111992258843779 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + m_CorrespondingSourceObject: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} m_PrefabInstance: {fileID: 3515378425540693942} m_PrefabAsset: {fileID: 0} --- !u!1001 &3515378426657685153 @@ -130,80 +119,70 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2119775930974504096} m_Modifications: - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalPosition.y value: -0.92999995 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_Name value: PlayerArmature objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} --- !u!4 &490576248761790154 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + m_CorrespondingSourceObject: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} m_PrefabInstance: {fileID: 3515378426657685153} m_PrefabAsset: {fileID: 0} --- !u!114 &3543048675319490572 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 135756642000475821, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + m_CorrespondingSourceObject: {fileID: 135756642000475821, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} m_PrefabInstance: {fileID: 3515378426657685153} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -214,8 +193,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!4 &4860276692040879404 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8338988566280778637, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + m_CorrespondingSourceObject: {fileID: 8338988566280778637, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} m_PrefabInstance: {fileID: 3515378426657685153} m_PrefabAsset: {fileID: 0} --- !u!1001 &3515378427008540405 @@ -223,128 +201,109 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2119775930974504096} m_Modifications: - target: {fileID: 1663187150, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: thirdPersonInputs value: objectReference: {fileID: 3543048675319490572} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6751388636123340836, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 6751388636123340836, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_Name value: UI_Canvas_StarterAssetsInputs_Joysticks objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} --- !u!224 &4072154296131656415 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + m_CorrespondingSourceObject: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} m_PrefabInstance: {fileID: 3515378427008540405} m_PrefabAsset: {fileID: 0} --- !u!1001 &3515378427225392744 @@ -352,79 +311,69 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2119775930974504096} m_Modifications: - - target: {fileID: 8944336655422409496, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409496, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: far clip plane value: 500 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409498, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409498, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_Name value: MainCamera objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalPosition.x value: 0.20000005 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalPosition.y value: 0.44500005 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalPosition.z value: -4 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} --- !u!4 &5542111180780342647 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + m_CorrespondingSourceObject: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} m_PrefabInstance: {fileID: 3515378427225392744} m_PrefabAsset: {fileID: 0} --- !u!1001 &3515378427639998752 @@ -432,78 +381,68 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2119775930974504096} m_Modifications: - - target: {fileID: 2070925441746177671, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177671, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_Name value: PlayerFollowCamera objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalPosition.x value: 0.20000005 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalPosition.y value: 0.44500005 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalPosition.z value: -4 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177913, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177913, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_Follow value: objectReference: {fileID: 4860276692040879404} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} --- !u!4 &3203261902030644824 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + m_CorrespondingSourceObject: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} m_PrefabInstance: {fileID: 3515378427639998752} m_PrefabAsset: {fileID: 0} diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/NestedParentCapsule_Unpack.prefab b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/NestedParentCapsule_Unpack.prefab index cb8ea3c87..f3fa32da6 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/NestedParentCapsule_Unpack.prefab +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/NestedParentCapsule_Unpack.prefab @@ -23,9 +23,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8047161636021232021} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.92999995, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5542111180780342647} - {fileID: 3203261902030644824} @@ -33,96 +35,83 @@ Transform: - {fileID: 4072154296131656415} - {fileID: 6858111992258843779} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3515378425540693942 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2119775930974504096} m_Modifications: - - target: {fileID: 1992104595683069851, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 1992104595683069851, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_Name value: UI_EventSystem objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalScale.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalPosition.y value: -0.92999995 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f0271df749728104eac22c3d897fd8ce, type: 3} --- !u!4 &6858111992258843779 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + m_CorrespondingSourceObject: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} m_PrefabInstance: {fileID: 3515378425540693942} m_PrefabAsset: {fileID: 0} --- !u!1001 &3515378427008540405 @@ -130,128 +119,109 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2119775930974504096} m_Modifications: - target: {fileID: 1663187150, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: thirdPersonInputs value: objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6751388636123340836, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 6751388636123340836, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_Name value: UI_Canvas_StarterAssetsInputs_Joysticks objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} --- !u!224 &4072154296131656415 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + m_CorrespondingSourceObject: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} m_PrefabInstance: {fileID: 3515378427008540405} m_PrefabAsset: {fileID: 0} --- !u!1001 &3515378427225392744 @@ -259,74 +229,65 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2119775930974504096} m_Modifications: - - target: {fileID: 8944336655422409498, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409498, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_Name value: MainCamera objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalPosition.x value: 0.20000005 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalPosition.y value: 0.44500005 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalPosition.z value: -4 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} --- !u!4 &5542111180780342647 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + m_CorrespondingSourceObject: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} m_PrefabInstance: {fileID: 3515378427225392744} m_PrefabAsset: {fileID: 0} --- !u!1001 &3515378427639998752 @@ -334,79 +295,69 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2119775930974504096} m_Modifications: - - target: {fileID: 2070925441746177671, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177671, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_Name value: PlayerFollowCamera objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalPosition.x value: 0.20000005 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalPosition.y value: 0.44500005 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalPosition.z value: -4 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177913, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177913, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_Follow value: objectReference: {fileID: 1654322001227874697} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} --- !u!4 &3203261902030644824 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + m_CorrespondingSourceObject: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} m_PrefabInstance: {fileID: 3515378427639998752} m_PrefabAsset: {fileID: 0} --- !u!1001 &4807976689997140263 @@ -414,79 +365,69 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2119775930974504096} m_Modifications: - - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_LocalPosition.y value: -0.92999995 objectReference: {fileID: 0} - - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1925873226565265906, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + - target: {fileID: 1925873226565265906, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} propertyPath: m_Name value: PlayerCapsule objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} ---- !u!4 &6001220780674294383 stripped +--- !u!4 &1654322001227874697 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + m_CorrespondingSourceObject: {fileID: 6074239116653777070, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} m_PrefabInstance: {fileID: 4807976689997140263} m_PrefabAsset: {fileID: 0} ---- !u!4 &1654322001227874697 stripped +--- !u!4 &6001220780674294383 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6074239116653777070, guid: 2553cec8fdb3eb643bbe9f2ec880c472, - type: 3} + m_CorrespondingSourceObject: {fileID: 1293029876712600392, guid: 2553cec8fdb3eb643bbe9f2ec880c472, type: 3} m_PrefabInstance: {fileID: 4807976689997140263} m_PrefabAsset: {fileID: 0} diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/PlayerFollowCamera.prefab b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/PlayerFollowCamera.prefab index fd6de14b1..d271451dc 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/PlayerFollowCamera.prefab +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Prefabs/PlayerFollowCamera.prefab @@ -9,7 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2070925441746177912} - - component: {fileID: 2070925441746177913} + - component: {fileID: 3514662025871593672} + - component: {fileID: 1914593700559516825} + - component: {fileID: 3786283587346549161} m_Layer: 0 m_Name: PlayerFollowCamera m_TagString: Untagged @@ -24,15 +26,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2070925441746177671} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5, y: 1.375, z: -4} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2070925442191277756} + m_ConstrainProportionsScale: 0 + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2070925441746177913 +--- !u!114 &3514662025871593672 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -41,104 +43,67 @@ MonoBehaviour: m_GameObject: {fileID: 2070925441746177671} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3} m_Name: m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: + Priority: + Enabled: 0 + m_Value: 0 + OutputChannel: 1 + StandbyUpdate: 2 m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: + m_LegacyPriority: 10 + Target: + TrackingTarget: {fileID: 0} + LookAtTarget: {fileID: 0} + CustomLookAtTarget: 0 + Lens: FieldOfView: 40 OrthographicSize: 10 NearClipPlane: 0.2 FarClipPlane: 500 Dutch: 0 - LensShift: {x: 0, y: 0} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 2070925442191277756} ---- !u!1 &2070925442191277755 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2070925442191277756} - - component: {fileID: 2070925442191277757} - - component: {fileID: 2070925442191277753} - - component: {fileID: 2070925442191277752} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2070925442191277756 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2070925442191277755} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2070925441746177912} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2070925442191277757 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2070925442191277755} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2070925442191277753 + ModeOverride: 0 + PhysicalProperties: + GateFit: 2 + SensorSize: {x: 21.946, y: 16.002} + LensShift: {x: 0, y: 0} + FocusDistance: 10 + Iso: 200 + ShutterSpeed: 0.005 + Aperture: 16 + BladeCount: 5 + Curvature: {x: 2, y: 11} + BarrelClipping: 0.25 + Anamorphism: 0 + BlendHint: 0 +--- !u!114 &1914593700559516825 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2070925442191277755} + m_GameObject: {fileID: 2070925441746177671} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} m_Name: m_EditorClassIdentifier: - m_NoiseProfile: {fileID: 11400000, guid: 46965f9cbaf525742a6da4c2172a99cd, type: 2} - m_PivotOffset: {x: 0, y: 0, z: 1} - m_AmplitudeGain: 0.5 - m_FrequencyGain: 0.3 - mNoiseOffsets: {x: -451.37964, y: 684.7062, z: 648.0488} ---- !u!114 &2070925442191277752 + NoiseProfile: {fileID: 11400000, guid: 46965f9cbaf525742a6da4c2172a99cd, type: 2} + PivotOffset: {x: 0, y: 0, z: 1} + AmplitudeGain: 0.5 + FrequencyGain: 0.3 + m_NoiseOffsets: {x: -451.37964, y: 684.7062, z: 648.0488} +--- !u!114 &3786283587346549161 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2070925442191277755} + m_GameObject: {fileID: 2070925441746177671} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd6043bde05a7fc4cba197d06915c1e3, type: 3} + m_Script: {fileID: 11500000, guid: 625c14eee3ad46c99df7c7c891ef668a, type: 3} m_Name: m_EditorClassIdentifier: Damping: {x: 0.1, y: 0.25, z: 0.3} @@ -146,8 +111,12 @@ MonoBehaviour: VerticalArmLength: 0 CameraSide: 0.6 CameraDistance: 4 - CameraCollisionFilter: - serializedVersion: 2 - m_Bits: 1 - IgnoreTag: Player - CameraRadius: 0.15 + AvoidObstacles: + Enabled: 1 + CollisionFilter: + serializedVersion: 2 + m_Bits: 1 + IgnoreTag: Player + CameraRadius: 0.15 + DampingIntoCollision: 0 + DampingFromCollision: 0 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scenes/Playground.unity b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scenes/Playground.unity index 0b7bb4056..ff452cd35 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scenes/Playground.unity +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scenes/Playground.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 1 m_FogColor: {r: 0.4862745, g: 0.69411767, b: 0.8117647, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 8900000, guid: 619e305f5165a9946b7f72464e44ca4a, type: 3} m_Sun: {fileID: 2114283754330233425} - m_IndirectSpecularColor: {r: 0.1727952, g: 0.2600245, b: 0.36693013, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -64,13 +63,9 @@ LightmapSettings: m_CompAOExponentDirect: 0.4 m_ExtractAmbientOcclusion: 0 m_Padding: 2 - m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, - type: 0} + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -98,16 +93,14 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: 51e8050f26ab504469d218c927558c5e, - type: 2} - m_LightingSettings: {fileID: 4890085278179872738, guid: 3b3f7400d3526e9429c39d03afb714b3, - type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: 51e8050f26ab504469d218c927558c5e, type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: 3b3f7400d3526e9429c39d03afb714b3, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -120,7 +113,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -150,12 +143,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 542508511} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.486, y: 1.566, z: 11.068} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2114283753834967213} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!215 &542508513 ReflectionProbe: @@ -192,8 +186,7 @@ ReflectionProbe: m_CustomBakedTexture: {fileID: 0} --- !u!4 &700051398 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8338988566280778637, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + m_CorrespondingSourceObject: {fileID: 8338988566280778637, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} m_PrefabInstance: {fileID: 1762682258} m_PrefabAsset: {fileID: 0} --- !u!1001 &746329221 @@ -201,84 +194,73 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1992104595683069851, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 1992104595683069851, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_Name value: UI_EventSystem objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalScale.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} + - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f0271df749728104eac22c3d897fd8ce, type: 3} --- !u!1 &874605735 GameObject: @@ -304,12 +286,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 874605735} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.19, y: 1.79, z: 21.97} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2114283753834967213} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!220 &874605737 LightProbeGroup: @@ -603,234 +586,218 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1028513131} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.5, y: 12, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2114283753834967213} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1221041499 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 8944336655422409496, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409496, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: far clip plane value: 500 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409498, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409498, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_Name value: MainCamera objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalPosition.x value: 0.20000005 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalPosition.y value: 1.375 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalPosition.z value: -4 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, - type: 3} + - target: {fileID: 8944336655422409503, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f6d148d888ffbf54b9afe9936dfaec1f, type: 3} --- !u!1001 &1402827283 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2070925441746177671, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177671, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_Name value: PlayerFollowCamera objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalPosition.x value: 0.20000005 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalPosition.y value: 1.375 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalPosition.z value: -4 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177912, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2070925441746177913, guid: a1a802ecaf6775746bb2a929fb554ad8, - type: 3} + - target: {fileID: 2070925441746177913, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} propertyPath: m_Follow value: objectReference: {fileID: 700051398} - m_RemovedComponents: [] + - target: {fileID: 3514662025871593672, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} + propertyPath: Target.TrackingTarget + value: + objectReference: {fileID: 700051398} + - target: {fileID: 3514662025871593672, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} + propertyPath: Target.CustomLookAtTarget + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 2070925441746177913, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} + - {fileID: 302414353685223452, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3} --- !u!1001 &1762682258 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + - target: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} propertyPath: m_Name value: PlayerArmature objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} --- !u!114 &1762682259 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 135756642000475821, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + m_CorrespondingSourceObject: {fileID: 135756642000475821, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} m_PrefabInstance: {fileID: 1762682258} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -841,8 +808,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &1762682260 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4416926081852918493, guid: 64dce48905ffd9b4293e595fa6941544, - type: 3} + m_CorrespondingSourceObject: {fileID: 4416926081852918493, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} m_PrefabInstance: {fileID: 1762682258} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -875,12 +841,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1764214107} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.965, y: 1.566, z: 15.191} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2114283753834967213} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!215 &1764214109 ReflectionProbe: @@ -920,133 +887,113 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1663187150, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: starterAssetsInputs value: objectReference: {fileID: 1762682259} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6751388636123340836, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 6751388636123340836, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_Name value: UI_Canvas_StarterAssetsInputs_Joysticks objectReference: {fileID: 0} - - target: {fileID: 6751388636123340836, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 6751388636123340836, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8890774966862588244, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} + - target: {fileID: 8890774966862588244, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} propertyPath: playerInput value: objectReference: {fileID: 1762682260} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} --- !u!1 &2114283753834967212 GameObject: @@ -1071,9 +1018,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2114283753834967212} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2114283754330233426} - {fileID: 1028513133} @@ -1081,7 +1030,6 @@ Transform: - {fileID: 542508512} - {fileID: 874605736} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2114283754330233424 GameObject: @@ -1108,9 +1056,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2114283754330233424} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 0.972549, g: 0.9607843, b: 0.8784314, a: 1} m_Intensity: 1 m_Range: 10 @@ -1160,8 +1107,12 @@ Light: m_BoundingSphereOverride: {x: 2.2e-44, y: 0, z: 0, w: 2.3164883} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &2114283754330233426 Transform: m_ObjectHideFlags: 0 @@ -1169,209 +1120,187 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2114283754330233424} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 39.455, y: 0, z: 7.815} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2114283753834967213} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &8345070700268369567 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1678179932331761816, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 1678179932331761816, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 2055894051710730007, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 2055894051710730007, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 2188624860443206089, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 2188624860443206089, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 2267305922763786408, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 2267305922763786408, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 2742374090662089873, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 2742374090662089873, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_Name value: Box_350x250x200_Prefab objectReference: {fileID: 0} - - target: {fileID: 2851502387910328280, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 2851502387910328280, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 3362877509795758829, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 3362877509795758829, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 3814548966972071594, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 3814548966972071594, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 3983598328739993525, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 3983598328739993525, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalRotation.w value: 0.6637226 objectReference: {fileID: 0} - - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalRotation.x value: -0.6637226 objectReference: {fileID: 0} - - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalRotation.y value: -0.2438697 objectReference: {fileID: 0} - - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalRotation.z value: -0.2438697 objectReference: {fileID: 0} - - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90 objectReference: {fileID: 0} - - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 4024457254690178231, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: -40.349 objectReference: {fileID: 0} - - target: {fileID: 4341615185304014817, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 4341615185304014817, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 4364672074426162701, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 4364672074426162701, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_Name value: Box_350x250x200_Prefab objectReference: {fileID: 0} - - target: {fileID: 4670052200047188738, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 4670052200047188738, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 5043663941078610840, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 5043663941078610840, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_Name value: Box_350x250x300_Prefab objectReference: {fileID: 0} - - target: {fileID: 6056394991271758435, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 6056394991271758435, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 6448643974395219577, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 6448643974395219577, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 6645204521410384571, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 6645204521410384571, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 6658370631066563872, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 6658370631066563872, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 7868691500460860468, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 7868691500460860468, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 8268551067277165611, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 8268551067277165611, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} - - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395522, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8345070699079395523, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} + - target: {fileID: 8345070699079395523, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} propertyPath: m_Name value: Environment objectReference: {fileID: 0} - - target: {fileID: 8680289381081499115, guid: 09aade0ecefd01e4b8f7661acf64f5c2, - type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 8680289381081499115, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7ab977a21c92388468ee65ad1c0e5a78, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 09aade0ecefd01e4b8f7661acf64f5c2, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2114283753834967213} + - {fileID: 8345070700268369567} + - {fileID: 1221041499} + - {fileID: 1402827283} + - {fileID: 1762682258} + - {fileID: 1979352518} + - {fileID: 746329221} diff --git a/Basic/ClientDriven/Assets/UI Toolkit/Panel Settings.asset b/Basic/ClientDriven/Assets/UI Toolkit/Panel Settings.asset index 65f333ad7..f05046d29 100644 --- a/Basic/ClientDriven/Assets/UI Toolkit/Panel Settings.asset +++ b/Basic/ClientDriven/Assets/UI Toolkit/Panel Settings.asset @@ -12,10 +12,14 @@ MonoBehaviour: m_Script: {fileID: 19101, guid: 0000000000000000e000000000000000, type: 0} m_Name: Panel Settings m_EditorClassIdentifier: - themeUss: {fileID: -4733365628477956816, guid: 999529c9acab81b4987589a36993c180, - type: 3} + themeUss: {fileID: -4733365628477956816, guid: 999529c9acab81b4987589a36993c180, type: 3} + m_DisableNoThemeWarning: 0 m_TargetTexture: {fileID: 0} + m_RenderMode: 0 + m_WorldSpaceLayer: 0 m_ScaleMode: 2 + m_ReferenceSpritePixelsPerUnit: 100 + m_PixelsPerUnit: 100 m_Scale: 1 m_ReferenceDpi: 144 m_FallbackDpi: 96 @@ -24,9 +28,11 @@ MonoBehaviour: m_Match: 0 m_SortingOrder: 0 m_TargetDisplay: 0 + m_BindingLogLevel: 0 m_ClearDepthStencil: 1 m_ClearColor: 0 m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0} + m_VertexBudget: 0 m_DynamicAtlasSettings: m_MinAtlasSize: 64 m_MaxAtlasSize: 4096 @@ -35,4 +41,6 @@ MonoBehaviour: m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0} + m_ICUDataAsset: {fileID: 0} + forceGammaRendering: 0 textSettings: {fileID: 0} diff --git a/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset.asset b/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset.asset index 1f85daa89..60cde2104 100644 --- a/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset.asset +++ b/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRenderPipelineAsset m_EditorClassIdentifier: - k_AssetVersion: 11 - k_AssetPreviousVersion: 11 + k_AssetVersion: 12 + k_AssetPreviousVersion: 12 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -33,6 +33,14 @@ MonoBehaviour: m_EnableLODCrossFade: 1 m_LODCrossFadeDitheringType: 1 m_ShEvalMode: 0 + m_LightProbeSystem: 0 + m_ProbeVolumeMemoryBudget: 1024 + m_ProbeVolumeBlendingMemoryBudget: 256 + m_SupportProbeVolumeGPUStreaming: 0 + m_SupportProbeVolumeDiskStreaming: 0 + m_SupportProbeVolumeScenarios: 0 + m_SupportProbeVolumeScenarioBlending: 0 + m_ProbeVolumeSHBands: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 2048 @@ -67,20 +75,30 @@ MonoBehaviour: m_SupportsLightLayers: 0 m_DebugLevel: 0 m_StoreActionsOptimization: 0 - m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 1 m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 + m_SupportScreenSpaceLensFlare: 1 + m_GPUResidentDrawerMode: 0 + m_SmallMeshScreenPercentage: 0 + m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_VolumeFrameworkUpdateMode: 0 - m_Textures: - blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} - bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_VolumeProfile: {fileID: 0} + apvScenesData: + obsoleteSceneBounds: + m_Keys: [] + m_Values: [] + obsoleteHasProbeVolumes: + m_Keys: [] + m_Values: m_PrefilteringModeMainLightShadows: 1 m_PrefilteringModeAdditionalLight: 4 m_PrefilteringModeAdditionalLightShadows: 1 @@ -91,6 +109,7 @@ MonoBehaviour: m_PrefilterDebugKeywords: 0 m_PrefilterWriteRenderingLayers: 0 m_PrefilterHDROutput: 0 + m_PrefilterAlphaOutput: 0 m_PrefilterSSAODepthNormals: 0 m_PrefilterSSAOSourceDepthLow: 0 m_PrefilterSSAOSourceDepthMedium: 0 @@ -103,7 +122,15 @@ MonoBehaviour: m_PrefilterDBufferMRT1: 0 m_PrefilterDBufferMRT2: 0 m_PrefilterDBufferMRT3: 0 + m_PrefilterSoftShadowsQualityLow: 0 + m_PrefilterSoftShadowsQualityMedium: 0 + m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 0 m_PrefilterNativeRenderPass: 0 + m_PrefilterUseLegacyLightmaps: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} diff --git a/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset b/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset index 430f7def1..5ccf19436 100644 --- a/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset +++ b/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset @@ -15,26 +15,20 @@ MonoBehaviour: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} + probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3} + probeVolumeResources: + probeVolumeDebugShader: {fileID: 0} + probeVolumeFragmentationDebugShader: {fileID: 0} + probeVolumeOffsetDebugShader: {fileID: 0} + probeVolumeSamplingDebugShader: {fileID: 0} + probeSamplingDebugMesh: {fileID: 0} + probeSamplingDebugTexture: {fileID: 0} + probeVolumeBlendStatesCS: {fileID: 0} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} - shaders: - blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - screenSpaceShadowPS: {fileID: 0} - samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} - fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} - fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} - materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} - blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} - cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} - objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} - dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 @@ -53,5 +47,7 @@ MonoBehaviour: m_RenderingMode: 0 m_DepthPrimingMode: 0 m_CopyDepthMode: 0 + m_DepthAttachmentFormat: 0 + m_DepthTextureFormat: 0 m_AccurateGbufferNormals: 0 m_IntermediateTextureMode: 1 diff --git a/Basic/ClientDriven/Assets/UniversalRenderPipelineGlobalSettings.asset b/Basic/ClientDriven/Assets/UniversalRenderPipelineGlobalSettings.asset index 98f0dfda6..427a3d7e3 100644 --- a/Basic/ClientDriven/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Basic/ClientDriven/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,7 +12,52 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 3 + m_ShaderStrippingSetting: + m_Version: 0 + m_ExportShaderVariants: 1 + m_ShaderVariantLogLevel: 0 + m_StripRuntimeDebugShaders: 1 + m_URPShaderStrippingSetting: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 0 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + m_ShaderVariantLogLevel: 0 + m_ExportShaderVariants: 1 + m_StripDebugVariants: 1 + m_StripUnusedPostProcessingVariants: 0 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + supportRuntimeDebugDisplay: 0 + m_EnableRenderGraph: 0 + m_Settings: + m_SettingsList: + m_List: + - rid: 7995702941539631104 + - rid: 7995702941539631105 + - rid: 7995702941539631106 + - rid: 7995702941539631107 + - rid: 7995702941539631108 + - rid: 7995702941539631109 + - rid: 7995702941539631110 + - rid: 7995702941539631111 + - rid: 7995702941539631112 + - rid: 7995702941539631113 + - rid: 7995702941539631114 + - rid: 7995702941539631115 + - rid: 7995702941539631116 + - rid: 7995702941539631117 + - rid: 7995702941539631118 + - rid: 7995702941539631119 + - rid: 7995702941539631120 + - rid: 7995702941539631121 + - rid: 7995702941539631122 + - rid: 7995702941539631123 + - rid: 7995702941539631124 + m_RuntimeSettings: + m_List: [] + m_AssetVersion: 8 + m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: - Light Layer default - Light Layer 1 @@ -31,11 +76,180 @@ MonoBehaviour: lightLayerName5: Light Layer 5 lightLayerName6: Light Layer 6 lightLayerName7: Light Layer 7 - m_StripDebugVariants: 1 - m_StripUnusedPostProcessingVariants: 0 - m_StripUnusedVariants: 1 - m_StripUnusedLODCrossFadeVariants: 1 - m_StripScreenCoordOverrideVariants: 1 - supportRuntimeDebugDisplay: 0 - m_ShaderVariantLogLevel: 0 - m_ExportShaderVariants: 1 + apvScenesData: + obsoleteSceneBounds: + m_Keys: [] + m_Values: [] + obsoleteHasProbeVolumes: + m_Keys: [] + m_Values: + references: + version: 2 + RefIds: + - rid: 7995702941539631104 + type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} + m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} + m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} + m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} + m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} + - rid: 7995702941539631105 + type: {class: UniversalRenderPipelineRuntimeShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} + m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} + m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + - rid: 7995702941539631106 + type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3} + m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} + m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} + m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} + m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3} + m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} + m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3} + m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} + - rid: 7995702941539631107 + type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_VolumeProfile: {fileID: 11400000, guid: 72f4d754eda3cbe488e53500b4baf088, type: 2} + - rid: 7995702941539631108 + type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} + m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} + - rid: 7995702941539631109 + type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} + m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} + m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} + - rid: 7995702941539631110 + type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 1 + m_BlueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + m_BayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_DebugFontTex: {fileID: 2800000, guid: 26a413214480ef144b2915d6ff4d0beb, type: 3} + - rid: 7995702941539631111 + type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 0 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + - rid: 7995702941539631112 + type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DebugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + m_HdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} + m_ProbeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3} + - rid: 7995702941539631113 + type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_EnableRenderCompatibilityMode: 0 + - rid: 7995702941539631114 + type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} + m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} + - rid: 7995702941539631115 + type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} + data: + m_Version: 0 + m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2, type: 3} + m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef, type: 3} + m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b, type: 3} + m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114, type: 3} + m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da, type: 3} + m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c, type: 3} + m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} + m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} + m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} + - rid: 7995702941539631116 + type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_EnableCompilationCaching: 1 + m_EnableValidityChecks: 1 + - rid: 7995702941539631117 + type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} + probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} + probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} + - rid: 7995702941539631118 + type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_IncludeReferencedInScenes: 0 + m_IncludeAssetsByLabel: 0 + m_LabelToInclude: + - rid: 7995702941539631119 + type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3} + subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3} + voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3} + traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} + traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} + skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} + skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} + renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} + renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} + - rid: 7995702941539631120 + type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} + m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} + m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} + - rid: 7995702941539631121 + type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 0 + m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3} + - rid: 7995702941539631122 + type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + probeVolumeDebugShader: {fileID: 4800000, guid: 3b21275fd12d65f49babb5286f040f2d, type: 3} + probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 3a80877c579b9144ebdcc6d923bca303, type: 3} + probeVolumeSamplingDebugShader: {fileID: 4800000, guid: bf54e6528c79a224e96346799064c393, type: 3} + probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} + probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} + numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} + - rid: 7995702941539631123 + type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_ProbeVolumeDisableStreamingAssets: 0 + - rid: 7995702941539631124 + type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 0 + m_ExportShaderVariants: 1 + m_ShaderVariantLogLevel: 0 + m_StripRuntimeDebugShaders: 1 diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json index 10e99f3e4..9403b7df4 100644 --- a/Basic/ClientDriven/Packages/manifest.json +++ b/Basic/ClientDriven/Packages/manifest.json @@ -1,20 +1,22 @@ { "dependencies": { - "com.unity.ai.navigation": "1.1.5", - "com.unity.cinemachine": "2.10.0", - "com.unity.collab-proxy": "2.3.1", - "com.unity.ide.rider": "3.0.28", + "com.unity.ai.navigation": "2.0.5", + "com.unity.cinemachine": "3.1.2", + "com.unity.collab-proxy": "2.5.2", + "com.unity.ide.rider": "3.0.34", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.7.0", + "com.unity.inputsystem": "1.11.2", + "com.unity.multiplayer.center": "1.0.0", + "com.unity.multiplayer.playmode": "1.3.2", "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", - "com.unity.netcode.gameobjects": "1.8.1", - "com.unity.render-pipelines.universal": "14.0.9", - "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.6", - "com.unity.ugui": "1.0.0", - "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", + "com.unity.netcode.gameobjects": "2.1.1", + "com.unity.render-pipelines.universal": "17.0.3", + "com.unity.test-framework": "1.4.5", + "com.unity.timeline": "1.8.7", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", + "com.unity.ugui": "2.0.0", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json index 8059ffbcf..98b7a2dfb 100644 --- a/Basic/ClientDriven/Packages/packages-lock.json +++ b/Basic/ClientDriven/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.ai.navigation": { - "version": "1.1.5", + "version": "2.0.5", "depth": 0, "source": "registry", "dependencies": { @@ -10,8 +10,8 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.13", - "depth": 1, + "version": "1.8.18", + "depth": 2, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -20,28 +20,30 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.10.0", + "version": "3.1.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.31" + "com.unity.splines": "2.0.0" }, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.3.1", + "version": "2.5.2", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "1.2.4", + "version": "2.5.1", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.6", - "com.unity.test-framework": "1.1.31" + "com.unity.burst": "1.8.17", + "com.unity.test-framework": "1.4.5", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, @@ -53,14 +55,14 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.5", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.28", + "version": "3.0.34", "depth": 0, "source": "registry", "dependencies": { @@ -85,7 +87,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.7.0", + "version": "1.11.2", "depth": 0, "source": "registry", "dependencies": { @@ -94,7 +96,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "3.1.3", + "version": "4.0.2", "depth": 1, "source": "registry", "dependencies": { @@ -104,12 +106,29 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.6", - "depth": 1, + "version": "1.3.2", + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.multiplayer.center": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.multiplayer.playmode": { + "version": "1.3.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.nuget.newtonsoft-json": "2.0.2" + }, + "url": "https://packages.unity.com" + }, "com.unity.multiplayer.samples.coop": { "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "depth": 0, @@ -123,25 +142,27 @@ "hash": "e48babbbf2e903d65e08a114aac3f3eba824a94a" }, "com.unity.multiplayer.tools": { - "version": "1.1.0", + "version": "2.2.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.profiling.core": "1.0.0-pre.1", - "com.unity.nuget.newtonsoft-json": "2.0.0", - "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.collections": "1.1.0", - "com.unity.modules.uielements": "1.0.0" + "com.unity.burst": "1.8.17", + "com.unity.collections": "2.4.0", + "com.unity.mathematics": "1.3.1", + "com.unity.profiling.core": "1.0.2", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.modules.uielements": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1" }, "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.8.1", + "version": "2.1.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.4.0" + "com.unity.transport": "2.3.0", + "com.unity.nuget.mono-cecil": "1.11.4" }, "url": "https://packages.unity.com" }, @@ -154,7 +175,7 @@ }, "com.unity.nuget.newtonsoft-json": { "version": "3.2.1", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -167,34 +188,46 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.11", + "version": "17.0.3", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.ugui": "1.0.0", + "com.unity.burst": "1.8.14", + "com.unity.mathematics": "1.3.2", + "com.unity.ugui": "2.0.0", + "com.unity.collections": "2.4.3", "com.unity.modules.physics": "1.0.0", "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.rendering.light-transport": "1.0.1" } }, "com.unity.render-pipelines.universal": { - "version": "14.0.9", + "version": "17.0.3", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.9", - "com.unity.render-pipelines.core": "14.0.11", - "com.unity.shadergraph": "14.0.11", - "com.unity.render-pipelines.universal-config": "14.0.9" + "com.unity.render-pipelines.core": "17.0.3", + "com.unity.shadergraph": "17.0.3", + "com.unity.render-pipelines.universal-config": "17.0.3" } }, "com.unity.render-pipelines.universal-config": { - "version": "14.0.10", + "version": "17.0.3", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.10" + "com.unity.render-pipelines.core": "17.0.3" + } + }, + "com.unity.rendering.light-transport": { + "version": "1.0.1", + "depth": 2, + "source": "builtin", + "dependencies": { + "com.unity.collections": "2.2.0", + "com.unity.mathematics": "1.2.4", + "com.unity.modules.terrain": "1.0.0" } }, "com.unity.searcher": { @@ -205,25 +238,25 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "2.7.4", + "version": "3.3.3", "depth": 2, "source": "registry", "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.13.0", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.services.core": "1.12.5", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.ugui": "1.0.0" + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.12.5", + "version": "1.13.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.modules.androidjni": "1.0.0" + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -232,11 +265,11 @@ "depth": 2, "source": "registry", "dependencies": { + "com.unity.collections": "1.2.4", "com.unity.services.core": "1.12.4", - "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.services.authentication": "2.0.0", - "com.unity.collections": "1.2.4" + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.services.authentication": "2.0.0" }, "url": "https://packages.unity.com" }, @@ -245,16 +278,16 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.services.core": "1.4.0", - "com.unity.services.authentication": "2.0.0", + "com.unity.transport": "1.3.0", "com.unity.services.qos": "1.1.0", + "com.unity.services.core": "1.4.0", + "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.services.authentication": "2.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", "com.unity.modules.unitywebrequestaudio": "1.0.0", "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.transport": "1.3.0" + "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -266,59 +299,97 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.11", + "version": "17.0.3", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.11", + "com.unity.render-pipelines.core": "17.0.3", "com.unity.searcher": "4.9.2" } }, + "com.unity.splines": { + "version": "2.6.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.mathematics": "1.2.1", + "com.unity.settings-manager": "1.0.3" + }, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot": { + "version": "2.0.10", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.9", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { - "version": "1.1.33", + "version": "1.4.5", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.textmeshpro": { - "version": "3.0.6", - "depth": 0, + "com.unity.test-framework.performance": { + "version": "3.0.3", + "depth": 3, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0" + "com.unity.test-framework": "1.1.31", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.6", + "version": "1.8.7", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.10", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.transport": { - "version": "1.4.1", + "version": "2.4.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.collections": "1.2.4", - "com.unity.burst": "1.6.6", - "com.unity.mathematics": "1.2.6" + "com.unity.burst": "1.8.12", + "com.unity.collections": "2.2.1", + "com.unity.mathematics": "1.3.1" }, "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -326,12 +397,11 @@ "com.unity.modules.imgui": "1.0.0" } }, - "com.veriorpies.parrelsync": { - "version": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", + "com.unity.modules.accessibility": { + "version": "1.0.0", "depth": 0, - "source": "git", - "dependencies": {}, - "hash": "bb3d5067e49e403d8b8ba15c036d313b4dd2c696" + "source": "builtin", + "dependencies": {} }, "com.unity.modules.ai": { "version": "1.0.0", @@ -380,6 +450,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -468,7 +544,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/Basic/ClientDriven/ProjectSettings/GraphicsSettings.asset b/Basic/ClientDriven/ProjectSettings/GraphicsSettings.asset index ac5357dc9..e91688ded 100644 --- a/Basic/ClientDriven/ProjectSettings/GraphicsSettings.asset +++ b/Basic/ClientDriven/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 14 + serializedVersion: 16 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -13,9 +13,6 @@ GraphicsSettings: m_ScreenSpaceShadows: m_Mode: 1 m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} m_DepthNormals: m_Mode: 1 m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} @@ -48,6 +45,7 @@ GraphicsSettings: m_LightmapStripping: 0 m_FogStripping: 0 m_InstancingStripping: 0 + m_BrgStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 m_LightmapKeepDynamicPlain: 1 @@ -58,9 +56,11 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] + m_RenderPipelineGlobalSettingsMap: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 65b382772cf112147b628f5fb37b83b2, type: 2} m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 - m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_SRPDefaultSettings: - UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 65b382772cf112147b628f5fb37b83b2, type: 2} + m_LightProbeOutsideHullStrategy: 0 + m_CameraRelativeLightCulling: 0 + m_CameraRelativeShadowCulling: 0 diff --git a/Basic/ClientDriven/ProjectSettings/MultiplayerManager.asset b/Basic/ClientDriven/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 000000000..2a936644e --- /dev/null +++ b/Basic/ClientDriven/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt index 9efb20c7a..76dad2cb2 100644 --- a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt +++ b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.27f1 -m_EditorVersionWithRevision: 2022.3.27f1 (73effa14754f) +m_EditorVersion: 6000.0.28f1 +m_EditorVersionWithRevision: 6000.0.28f1 (f336aca0cab5) diff --git a/Basic/ClientDriven/ProjectSettings/ShaderGraphSettings.asset b/Basic/ClientDriven/ProjectSettings/ShaderGraphSettings.asset index 3250b068e..e66042a7c 100644 --- a/Basic/ClientDriven/ProjectSettings/ShaderGraphSettings.asset +++ b/Basic/ClientDriven/ProjectSettings/ShaderGraphSettings.asset @@ -15,3 +15,4 @@ MonoBehaviour: shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 + customHeatmapValues: {fileID: 0} diff --git a/Basic/ClientDriven/ProjectSettings/TagManager.asset b/Basic/ClientDriven/ProjectSettings/TagManager.asset index c55ea6c7d..f83cc57e2 100644 --- a/Basic/ClientDriven/ProjectSettings/TagManager.asset +++ b/Basic/ClientDriven/ProjectSettings/TagManager.asset @@ -2,7 +2,7 @@ %TAG !u! tag:unity3d.com,2011: --- !u!78 &1 TagManager: - serializedVersion: 2 + serializedVersion: 3 tags: - CinemachineTarget layers: @@ -42,3 +42,12 @@ TagManager: - name: Default uniqueID: 0 locked: 0 + m_RenderingLayers: + - Default + - Light Layer 1 + - Light Layer 2 + - Light Layer 3 + - Light Layer 4 + - Light Layer 5 + - Light Layer 6 + - Light Layer 7 diff --git a/Basic/ClientDriven/ProjectSettings/URPProjectSettings.asset b/Basic/ClientDriven/ProjectSettings/URPProjectSettings.asset index cd7fd8c61..08faf0336 100644 --- a/Basic/ClientDriven/ProjectSettings/URPProjectSettings.asset +++ b/Basic/ClientDriven/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 7 + m_LastMaterialVersion: 9 diff --git a/Basic/ClientDriven/ProjectSettings/VirtualProjectsConfig.json b/Basic/ClientDriven/ProjectSettings/VirtualProjectsConfig.json new file mode 100644 index 000000000..1c43509ad --- /dev/null +++ b/Basic/ClientDriven/ProjectSettings/VirtualProjectsConfig.json @@ -0,0 +1,4 @@ +{ + "PlayerTags": [], + "version": "1.3.2" +} \ No newline at end of file diff --git a/Basic/ClientDriven/README.md b/Basic/ClientDriven/README.md index ac0abe412..a0b5590a0 100644 --- a/Basic/ClientDriven/README.md +++ b/Basic/ClientDriven/README.md @@ -3,7 +3,7 @@ # Client Driven -[![UnityVersion](https://img.shields.io/badge/Unity%20Version:-2022.3%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/2022.3.0) +[![UnityVersion](https://img.shields.io/badge/Unity%20Version:-6000.0%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/6000.0.23#notes) [![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.8.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.8.1) [![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.6.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.6.0)

diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e6e67e46..067e38ab1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,12 @@ #### Changed - Player spawning has been deferred to be performed manually by an in-scene placed NetworkObject (#257) Player spawn has been moved to coincide with NetworkManager's OnNetworkSessionSynchronized callback, ensuring the player is spawned after synchronizing the game scene's NetworkObjects. +### Client Driven + +#### Changed +- Updated project to Unity 6 +- Replaced 3rd party ParrelSync package with Unity's Multiplayer Play Mode + ## [1.9.0] 2024-10-31 ### Distributed Authority Social Hub @@ -33,7 +39,7 @@ - Disabled compatibility mode for RenderGraph, as it's going to be deprecated and throws warnings - Removed runtime network stats monitor from the scene to improve readability - Removed deprecated visual studio code package -- Updated packages: Rider to 3.0.31, Input System to 1.11.1, Tutorial Framework to 4.0.2, Multiplayer Tools to 2.2.1, Netcode For GameObejcts to 2.0.0, UGUI to 2.0.0, Test Framework to 1.4.5, Universal Render Pipeline to 17.0.3 +- Updated packages: Rider to 3.0.31, Input System to 1.11.1, Tutorial Framework to 4.0.2, Multiplayer Tools to 2.2.1, Netcode For GameObjects to 2.0.0, UGUI to 2.0.0, Test Framework to 1.4.5, Universal Render Pipeline to 17.0.3 #### Fixed - Fixed "Build Profile" window not being clickable during the last page of each tutorial