diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 13ebe1e26..509d6b440 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -19,7 +19,7 @@ projects: - name: 2dspaceshooter path: Basic/2DSpaceShooter test_editors: - - 2022.3 + - 6000.0 run_editor_tests: !!bool false run_playmode_tests: !!bool false test_filter: diff --git a/Basic/2DSpaceShooter/Assets/DefaultVolumeProfile.asset b/Basic/2DSpaceShooter/Assets/DefaultVolumeProfile.asset new file mode 100644 index 000000000..0698aa068 --- /dev/null +++ b/Basic/2DSpaceShooter/Assets/DefaultVolumeProfile.asset @@ -0,0 +1,795 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8964208677139223352 +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 &-8433714595071033694 +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 &-7461352376938470952 +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 &-6813127317898028151 +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 &-6373009412419516476 +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 &-6279898645766621949 +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 &-5754603010105222911 +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 &-4173822406571908864 +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 &-3202294988985168130 +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 &-2451704402934648509 +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 &-1382357962317922405 +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 &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: -5754603010105222911} + - {fileID: 569350756004089973} + - {fileID: -3202294988985168130} + - {fileID: -4173822406571908864} + - {fileID: -8433714595071033694} + - {fileID: 1161589703867477174} + - {fileID: -6813127317898028151} + - {fileID: 6012940824009839110} + - {fileID: -1382357962317922405} + - {fileID: 2204129025762152949} + - {fileID: -8964208677139223352} + - {fileID: -6373009412419516476} + - {fileID: 2755675197262057330} + - {fileID: -6279898645766621949} + - {fileID: 1633129381194934328} + - {fileID: 947140741379304652} + - {fileID: -2451704402934648509} + - {fileID: 7493176164098825481} + - {fileID: -7461352376938470952} +--- !u!114 &569350756004089973 +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 &947140741379304652 +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 &1161589703867477174 +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 &1633129381194934328 +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 &2204129025762152949 +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 &2755675197262057330 +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 &6012940824009839110 +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 +--- !u!114 &7493176164098825481 +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 diff --git a/Basic/2DSpaceShooter/Assets/DefaultVolumeProfile.asset.meta b/Basic/2DSpaceShooter/Assets/DefaultVolumeProfile.asset.meta new file mode 100644 index 000000000..d87b11931 --- /dev/null +++ b/Basic/2DSpaceShooter/Assets/DefaultVolumeProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 370bf05ba0c5a574cb3b7f1ff964fb64 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Basic/2DSpaceShooter/Assets/Materials/asteroids.mat b/Basic/2DSpaceShooter/Assets/Materials/asteroids.mat index d97c2c407..20426e9a3 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/asteroids.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/asteroids.mat @@ -24,6 +24,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -72,6 +73,7 @@ Material: - _Tiling: {r: 3.2, g: 1, b: 0, a: 0} - _TilingOffset: {r: 3.2, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5508388851961208037 MonoBehaviour: m_ObjectHideFlags: 11 @@ -84,4 +86,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/blockGlow.mat b/Basic/2DSpaceShooter/Assets/Materials/blockGlow.mat index f751f02ea..e915d9ef4 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/blockGlow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/blockGlow.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: disabledShaderPasses: - DepthOnly - SHADOWCASTER + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -151,3 +152,4 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/blockGlow02.mat b/Basic/2DSpaceShooter/Assets/Materials/blockGlow02.mat index 6315e3312..480aae428 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/blockGlow02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/blockGlow02.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: disabledShaderPasses: - DepthOnly - SHADOWCASTER + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -151,3 +152,4 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/blocks.mat b/Basic/2DSpaceShooter/Assets/Materials/blocks.mat index 5e6686f67..761385760 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/blocks.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/blocks.mat @@ -128,6 +128,7 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6249219236255181419 MonoBehaviour: m_ObjectHideFlags: 11 @@ -140,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bounds.mat b/Basic/2DSpaceShooter/Assets/Materials/bounds.mat index 8fb84f9ee..df118e547 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bounds.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bounds.mat @@ -24,6 +24,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -71,6 +72,7 @@ Material: - _PanningSpeed: {r: -1, g: 0, b: 0, a: 0} - _TilingOffset: {r: 0.52, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2811474345779369478 MonoBehaviour: m_ObjectHideFlags: 11 @@ -83,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bounds02.mat b/Basic/2DSpaceShooter/Assets/Materials/bounds02.mat index ddecd89f9..497592ae3 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bounds02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bounds02.mat @@ -24,6 +24,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -72,6 +73,7 @@ Material: - _Tiling: {r: 1, g: 1, b: 0, a: 0} - _TilingOffset: {r: 2.35, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4381910661832847740 MonoBehaviour: m_ObjectHideFlags: 11 @@ -84,4 +86,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bullet.mat b/Basic/2DSpaceShooter/Assets/Materials/bullet.mat index 8f737a999..983ef8e5f 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bullet.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bullet.mat @@ -24,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -71,6 +72,7 @@ Material: - _PanningSpeed: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2855796434919115645 MonoBehaviour: m_ObjectHideFlags: 11 @@ -83,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bullet02.mat b/Basic/2DSpaceShooter/Assets/Materials/bullet02.mat index b44dda08c..778bc2cbf 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bullet02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bullet02.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: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -84,3 +85,4 @@ Material: - _PanningSpeed: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bulletTrail.mat b/Basic/2DSpaceShooter/Assets/Materials/bulletTrail.mat index b14246d23..a8238fd82 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bulletTrail.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bulletTrail.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: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -84,3 +85,4 @@ Material: - _PanningSpeed: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 0.67, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bulletTrail02.mat b/Basic/2DSpaceShooter/Assets/Materials/bulletTrail02.mat index 485f29ae2..9461cc1bc 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bulletTrail02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bulletTrail02.mat @@ -24,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -71,6 +72,7 @@ Material: - _PanningSpeed: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 0.67, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &9021274784979636411 MonoBehaviour: m_ObjectHideFlags: 11 @@ -83,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/edgeGradient.mat b/Basic/2DSpaceShooter/Assets/Materials/edgeGradient.mat index 4310394dd..9d6e3057b 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/edgeGradient.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/edgeGradient.mat @@ -24,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -139,6 +140,7 @@ Material: - _Tiling: {r: 1, g: 0.99, b: 0, a: 0} - _TilingOffset: {r: 1, g: 0.98, b: 0, a: 0.01} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4986743797660698998 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/2DSpaceShooter/Assets/Materials/explosion.mat b/Basic/2DSpaceShooter/Assets/Materials/explosion.mat index 598f47e7a..a2f148a12 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/explosion.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/explosion.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 @@ -155,3 +155,4 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/explosion02.mat b/Basic/2DSpaceShooter/Assets/Materials/explosion02.mat index a9325fe2c..d217196b0 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/explosion02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/explosion02.mat @@ -140,6 +140,7 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8519788726493962658 MonoBehaviour: m_ObjectHideFlags: 11 @@ -152,4 +153,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/explosionGlow.mat b/Basic/2DSpaceShooter/Assets/Materials/explosionGlow.mat index 54e905354..97a15da06 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/explosionGlow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/explosionGlow.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: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -154,3 +155,4 @@ Material: - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} - _TintColor: {r: 0.376, g: 0.67759985, b: 1, a: 0.7372549} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/explosionSparks.mat b/Basic/2DSpaceShooter/Assets/Materials/explosionSparks.mat index 67cdaedcb..347f24976 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/explosionSparks.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/explosionSparks.mat @@ -24,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -141,6 +142,7 @@ Material: - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} - _TintColor: {r: 0.376, g: 0.67759985, b: 1, a: 0.7372549} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &809722511008761116 MonoBehaviour: m_ObjectHideFlags: 11 @@ -153,4 +155,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/frictionGlow.mat b/Basic/2DSpaceShooter/Assets/Materials/frictionGlow.mat index 8f20becb5..02e2f54c8 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/frictionGlow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/frictionGlow.mat @@ -132,6 +132,7 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6517551349316540071 MonoBehaviour: m_ObjectHideFlags: 11 @@ -144,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/frictionSparks.mat b/Basic/2DSpaceShooter/Assets/Materials/frictionSparks.mat index f2defef53..f65419d7f 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/frictionSparks.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/frictionSparks.mat @@ -24,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -141,6 +142,7 @@ Material: - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} - _TintColor: {r: 0.376, g: 0.67759985, b: 1, a: 0.7372549} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &809722511008761116 MonoBehaviour: m_ObjectHideFlags: 11 @@ -153,4 +155,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/godRays.mat b/Basic/2DSpaceShooter/Assets/Materials/godRays.mat index 34a349c9c..e05fd2c48 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/godRays.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/godRays.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: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -85,3 +86,4 @@ Material: - _Tiling: {r: 1, g: 1, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/matte.mat b/Basic/2DSpaceShooter/Assets/Materials/matte.mat index 1a3cd361a..fd69780c3 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/matte.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/matte.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -86,6 +87,7 @@ Material: - _Tiling: {r: 1, g: 1, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6408699025902948349 MonoBehaviour: m_ObjectHideFlags: 11 @@ -98,4 +100,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/metal.mat b/Basic/2DSpaceShooter/Assets/Materials/metal.mat index 6f7ba6971..d29302baf 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/metal.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/metal.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -47,6 +48,7 @@ Material: m_Colors: - _Color: {r: 0.20266399, g: 0.29799882, b: 0.376, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &778213318191762124 MonoBehaviour: m_ObjectHideFlags: 11 @@ -59,4 +61,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planet.mat b/Basic/2DSpaceShooter/Assets/Materials/planet.mat index 0eaf25a74..d43b927b4 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planet.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planet.mat @@ -132,6 +132,7 @@ Material: - _Tiling: {r: 1, g: 1, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1592046647412693563 MonoBehaviour: m_ObjectHideFlags: 11 @@ -144,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planet02.mat b/Basic/2DSpaceShooter/Assets/Materials/planet02.mat index e8f5c918b..3e3c73107 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planet02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planet02.mat @@ -27,6 +27,7 @@ Material: RenderType: Opaque disabledShaderPasses: - ALWAYS + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -142,6 +143,7 @@ Material: - _Tiling: {r: 1, g: 1, b: 0, a: 0} - _TilingOffset: {r: 3.71, g: 2.63, b: 0, a: 0.6} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2418944104244394936 MonoBehaviour: m_ObjectHideFlags: 11 @@ -154,4 +156,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planetGlow.mat b/Basic/2DSpaceShooter/Assets/Materials/planetGlow.mat index f6cc7f542..75c58b551 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planetGlow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planetGlow.mat @@ -25,6 +25,7 @@ Material: - ALWAYS - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -140,6 +141,7 @@ Material: - _Tiling: {r: 1, g: 1, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3394128095122904653 MonoBehaviour: m_ObjectHideFlags: 11 @@ -152,4 +154,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planetRings.mat b/Basic/2DSpaceShooter/Assets/Materials/planetRings.mat index f188eb750..2bb2b69b5 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planetRings.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planetRings.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: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -86,3 +87,4 @@ Material: - _Tiling: {r: 1, g: 2, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planetRings02.mat b/Basic/2DSpaceShooter/Assets/Materials/planetRings02.mat index a5210ec6d..ae4bd7492 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planetRings02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planetRings02.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: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -86,3 +87,4 @@ Material: - _Tiling: {r: 1, g: 2, b: 0, a: 0} - _TilingOffset: {r: 1.12, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planetShadow.mat b/Basic/2DSpaceShooter/Assets/Materials/planetShadow.mat index 80c29912c..c2dcb15ea 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planetShadow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planetShadow.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: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -154,3 +155,4 @@ Material: - _TilingOffset: {r: 0.88, g: 0.56, b: -0.04, a: 0.22} - _TintColor: {r: 0, g: 0.050700005, b: 0.234, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/powerUpRing.mat b/Basic/2DSpaceShooter/Assets/Materials/powerUpRing.mat index fb00fe4d5..de19f651a 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/powerUpRing.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/powerUpRing.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: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -84,3 +85,4 @@ Material: - _PanningSpeed: {r: -1, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/ship.mat b/Basic/2DSpaceShooter/Assets/Materials/ship.mat index d6edd3c35..409849d5c 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/ship.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/ship.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: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -125,3 +126,4 @@ Material: - _PanningSpeed: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/shipGlow.mat b/Basic/2DSpaceShooter/Assets/Materials/shipGlow.mat index 45ac9df4b..0ef8880e1 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/shipGlow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/shipGlow.mat @@ -24,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -130,6 +131,7 @@ Material: - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} - _TintColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1816142951418574024 MonoBehaviour: m_ObjectHideFlags: 11 @@ -142,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/spriteAdditive.mat b/Basic/2DSpaceShooter/Assets/Materials/spriteAdditive.mat index 0a8a60a0c..c98950dbc 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/spriteAdditive.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/spriteAdditive.mat @@ -119,6 +119,7 @@ Material: - _Tiling: {r: 1, g: 1, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6435254776819127703 MonoBehaviour: m_ObjectHideFlags: 11 @@ -131,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/starSingle.mat b/Basic/2DSpaceShooter/Assets/Materials/starSingle.mat index ee577cecf..c1491b991 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/starSingle.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/starSingle.mat @@ -132,6 +132,7 @@ Material: - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} - _TintColor: {r: 0.376, g: 0.67759985, b: 1, a: 0.7372549} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &140447399497326293 MonoBehaviour: m_ObjectHideFlags: 11 @@ -144,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Materials/stars.mat b/Basic/2DSpaceShooter/Assets/Materials/stars.mat index ab84526bf..a697d03c5 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/stars.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/stars.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 @@ -100,3 +100,4 @@ Material: - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} - _TintColor: {r: 0.45025885, g: 0.4673882, b: 0.624, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/sun.mat b/Basic/2DSpaceShooter/Assets/Materials/sun.mat index f680da759..c832e0b1a 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/sun.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/sun.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: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -154,3 +155,4 @@ Material: - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} - _TintColor: {r: 0, g: 0.050700005, b: 0.234, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/thrust.mat b/Basic/2DSpaceShooter/Assets/Materials/thrust.mat index 095e3b318..1d5e85597 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/thrust.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/thrust.mat @@ -132,6 +132,7 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6517551349316540071 MonoBehaviour: m_ObjectHideFlags: 11 @@ -144,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs b/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs index 53ca86cbe..b897160b5 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs @@ -51,7 +51,7 @@ public void SetVelocity(Vector2 velocity) if (IsServer) { var bulletRb = GetComponent(); - bulletRb.velocity = velocity; + bulletRb.linearVelocity = velocity; ClientSetVelocityRpc(velocity); } } @@ -62,7 +62,7 @@ void ClientSetVelocityRpc(Vector2 velocity) if (!IsHost) { var bulletRb = GetComponent(); - bulletRb.velocity = velocity; + bulletRb.linearVelocity = velocity; } } diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs index c1a22d4f6..5a534c16f 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs @@ -191,7 +191,7 @@ public void TakeDamage(int amount) Energy.Value = 100; // reset ship to start position transform.position = NetworkManager.GetComponent().GetNextSpawnPosition(); - GetComponent().velocity = Vector3.zero; + GetComponent().linearVelocity = Vector3.zero; GetComponent().angularVelocity = 0; } } @@ -210,7 +210,7 @@ void Fire(Vector3 direction) var bulletGo = m_ObjectPool.GetNetworkObject(BulletPrefab).gameObject; bulletGo.transform.position = transform.position + direction; - var velocity = m_Rigidbody2D.velocity; + var velocity = m_Rigidbody2D.linearVelocity; velocity += (Vector2)(direction) * 10; bulletGo.GetComponent().Spawn(true); var bullet = bulletGo.GetComponent(); @@ -292,9 +292,9 @@ void UpdateServer() top *= 1.5f; } - if (m_Rigidbody2D.velocity.magnitude > top) + if (m_Rigidbody2D.linearVelocity.magnitude > top) { - m_Rigidbody2D.velocity = m_Rigidbody2D.velocity.normalized * top; + m_Rigidbody2D.linearVelocity = m_Rigidbody2D.linearVelocity.normalized * top; } } } diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs b/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs index 6aa278724..98e1664c2 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs @@ -90,7 +90,7 @@ void SpawnAsteroids() go.transform.rotation = Quaternion.Euler(0, 0, dir); var rigidbody2D = go.GetComponent(); rigidbody2D.angularVelocity = dir; - rigidbody2D.velocity = new Vector2(dx, dy); + rigidbody2D.linearVelocity = new Vector2(dx, dy); asteroid.asteroidPrefab = m_AsteroidPrefab; asteroid.NetworkObject.Spawn(true); } diff --git a/Basic/2DSpaceShooter/Assets/UI Toolkit/Panel Settings.asset b/Basic/2DSpaceShooter/Assets/UI Toolkit/Panel Settings.asset index a54399f29..053c62145 100644 --- a/Basic/2DSpaceShooter/Assets/UI Toolkit/Panel Settings.asset +++ b/Basic/2DSpaceShooter/Assets/UI Toolkit/Panel Settings.asset @@ -14,9 +14,13 @@ MonoBehaviour: m_EditorClassIdentifier: 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 @@ -25,9 +29,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 @@ -36,4 +42,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/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset.asset b/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset.asset index 3725eaf2b..a1276758a 100644 --- a/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset.asset +++ b/Basic/2DSpaceShooter/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: 0 m_MainLightShadowsSupported: 0 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: 0 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/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset b/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset index c8aef0b1f..7b54ef84b 100644 --- a/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset +++ b/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset @@ -16,31 +16,21 @@ MonoBehaviour: 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: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, - type: 3} - 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 @@ -59,5 +49,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/2DSpaceShooter/Assets/UniversalRenderPipelineGlobalSettings.asset b/Basic/2DSpaceShooter/Assets/UniversalRenderPipelineGlobalSettings.asset index 98f0dfda6..78e81f240 100644 --- a/Basic/2DSpaceShooter/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Basic/2DSpaceShooter/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: 4980929078441541632 + - rid: 4980929078441541633 + - rid: 4980929078441541634 + - rid: 4980929078441541635 + - rid: 4980929078441541636 + - rid: 4980929078441541637 + - rid: 4980929078441541638 + - rid: 4980929078441541639 + - rid: 4980929078441541640 + - rid: 4980929078441541641 + - rid: 4980929078441541642 + - rid: 4980929078441541643 + - rid: 4980929078441541644 + - rid: 4980929078441541645 + - rid: 4980929078441541646 + - rid: 4980929078441541647 + - rid: 4980929078441541648 + - rid: 4980929078441541649 + - rid: 4980929078441541650 + - rid: 4980929078441541651 + - rid: 4980929078441541652 + m_RuntimeSettings: + m_List: [] + m_AssetVersion: 8 + m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: - Light Layer default - Light Layer 1 @@ -31,11 +76,256 @@ 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: 4980929078441541632 + 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: 4980929078441541633 + 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: 4980929078441541634 + 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: 4980929078441541635 + type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_VolumeProfile: {fileID: 11400000, guid: 370bf05ba0c5a574cb3b7f1ff964fb64, + type: 2} + - rid: 4980929078441541636 + 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: 4980929078441541637 + 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: 4980929078441541638 + 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: 4980929078441541639 + 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: 4980929078441541640 + 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: 4980929078441541641 + type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_EnableRenderCompatibilityMode: 0 + - rid: 4980929078441541642 + 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: 4980929078441541643 + 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: 4980929078441541644 + type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_EnableCompilationCaching: 1 + m_EnableValidityChecks: 1 + - rid: 4980929078441541645 + 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: 4980929078441541646 + type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_IncludeReferencedInScenes: 0 + m_IncludeAssetsByLabel: 0 + m_LabelToInclude: + - rid: 4980929078441541647 + 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: 4980929078441541648 + 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: 4980929078441541649 + 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: 4980929078441541650 + 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: 4980929078441541651 + type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_ProbeVolumeDisableStreamingAssets: 0 + - rid: 4980929078441541652 + 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/2DSpaceShooter/Packages/manifest.json b/Basic/2DSpaceShooter/Packages/manifest.json index 931873e68..fadd5495b 100644 --- a/Basic/2DSpaceShooter/Packages/manifest.json +++ b/Basic/2DSpaceShooter/Packages/manifest.json @@ -1,20 +1,20 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ai.navigation": "1.1.5", - "com.unity.collab-proxy": "2.2.0", - "com.unity.ide.rider": "3.0.28", + "com.unity.ai.navigation": "2.0.5", + "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.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.postprocessing": "3.2.2", - "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.postprocessing": "3.4.0", + "com.unity.render-pipelines.universal": "17.0.3", + "com.unity.test-framework": "1.4.5", + "com.unity.timeline": "1.8.7", + "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/2DSpaceShooter/Packages/packages-lock.json b/Basic/2DSpaceShooter/Packages/packages-lock.json index f26807263..d0c0f4dd2 100644 --- a/Basic/2DSpaceShooter/Packages/packages-lock.json +++ b/Basic/2DSpaceShooter/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.ai.navigation": { - "version": "1.1.5", + "version": "2.0.5", "depth": 0, "source": "registry", "dependencies": { @@ -16,8 +16,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", @@ -26,19 +26,21 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.2.0", + "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" }, @@ -50,14 +52,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": { @@ -74,15 +76,8 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.learn.iet-framework": { - "version": "3.1.3", + "version": "4.0.2", "depth": 1, "source": "registry", "dependencies": { @@ -92,12 +87,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, @@ -111,25 +123,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" }, @@ -142,13 +156,13 @@ }, "com.unity.nuget.newtonsoft-json": { "version": "3.2.1", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.2.2", + "version": "3.4.0", "depth": 0, "source": "registry", "dependencies": { @@ -164,34 +178,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": { @@ -202,25 +228,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" }, @@ -229,11 +255,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" }, @@ -242,16 +268,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" }, @@ -263,59 +289,60 @@ "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.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.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": { @@ -323,12 +350,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", @@ -377,6 +403,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, @@ -465,7 +497,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/2DSpaceShooter/ProjectSettings/GraphicsSettings.asset b/Basic/2DSpaceShooter/ProjectSettings/GraphicsSettings.asset index 7ad07fe01..4e827ad08 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/GraphicsSettings.asset +++ b/Basic/2DSpaceShooter/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} @@ -50,6 +47,7 @@ GraphicsSettings: m_LightmapStripping: 0 m_FogStripping: 0 m_InstancingStripping: 0 + m_BrgStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 m_LightmapKeepDynamicPlain: 1 @@ -60,10 +58,12 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] + m_RenderPipelineGlobalSettingsMap: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: e1f482fb210f5384b969fead96cfa831, + type: 2} m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 - m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_SRPDefaultSettings: - UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: e1f482fb210f5384b969fead96cfa831, - type: 2} + m_LightProbeOutsideHullStrategy: 0 + m_CameraRelativeLightCulling: 0 + m_CameraRelativeShadowCulling: 0 diff --git a/Basic/2DSpaceShooter/ProjectSettings/MultiplayerManager.asset b/Basic/2DSpaceShooter/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 000000000..2a936644e --- /dev/null +++ b/Basic/2DSpaceShooter/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/2DSpaceShooter/ProjectSettings/ProjectSettings.asset b/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset index 78141d60f..b81083f13 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset +++ b/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 26 + serializedVersion: 28 productGUID: 56c97ca33ead60942a273d3ef29b1be4 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,6 +49,7 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 unsupportedMSAAFallback: 0 + m_SpriteBatchMaxVertexCount: 65535 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -70,16 +71,18 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 androidBlitType: 0 - androidResizableWindow: 0 + androidResizeableActivity: 0 androidDefaultWindowWidth: 1920 androidDefaultWindowHeight: 1080 androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 0 + androidApplicationEntry: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 - captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 @@ -95,6 +98,7 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 + meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -126,16 +130,16 @@ PlayerSettings: switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 - switchNVNGraphicsFirmwareMemory: 32 switchMaxWorkerMultiple: 8 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 + switchNVNGraphicsFirmwareMemory: 32 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 1.5.0 preloadedAssets: [] metroInputSource: 1 @@ -157,6 +161,7 @@ PlayerSettings: resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 + androidMinAspectRatio: 1 applicationIdentifier: Android: com.Company.ProductName Standalone: com.Unity.2DSpaceShooter @@ -169,7 +174,7 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 22 + AndroidMinSdkVersion: 23 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -179,16 +184,18 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 12.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 12.0 + tvOSTargetOSVersionString: 13.0 VisionOSSdkVersion: 0 VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 @@ -215,7 +222,6 @@ PlayerSettings: rgba: 3452816845 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -223,7 +229,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: iOSLaunchScreenCustomStoryboardPath: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] @@ -233,6 +238,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 1 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: @@ -259,12 +265,12 @@ PlayerSettings: useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 - AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 @@ -277,11 +283,12 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - chromeosInputEmulation: 1 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 + AndroidReportGooglePlayAppDependencies: 1 + androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: - m_BuildTarget: m_Icons: @@ -521,8 +528,8 @@ PlayerSettings: m_APIs: 02000000 m_Automatic: 1 - m_BuildTarget: AndroidPlayer - m_APIs: 08000000 - m_Automatic: 0 + m_APIs: 150000000b000000 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 @@ -537,19 +544,15 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: - - m_BuildTarget: Standalone + - serializedVersion: 2 + m_BuildTarget: Standalone m_EncodingQuality: 1 - - m_BuildTarget: XboxOne + - serializedVersion: 2 + m_BuildTarget: XboxOne m_EncodingQuality: 1 - - m_BuildTarget: PS4 + - serializedVersion: 2 + m_BuildTarget: PS4 m_EncodingQuality: 1 - m_BuildTargetGroupHDRCubemapEncodingQuality: - - m_BuildTarget: Standalone - m_EncodingQuality: 2 - - m_BuildTarget: XboxOne - m_EncodingQuality: 2 - - m_BuildTarget: PS4 - m_EncodingQuality: 2 m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] @@ -557,6 +560,7 @@ PlayerSettings: playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 + editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 @@ -564,7 +568,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: - macOSTargetOSVersion: 10.13.0 + macOSTargetOSVersion: 11.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -702,12 +706,14 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 + switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: -842150451 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -810,7 +816,12 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 + webGLEnableWebGPU: 0 webGLPowerPreference: 2 + webGLWebAssemblyTable: 0 + webGLWebAssemblyBigInt: 0 + webGLCloseOnQuit: 0 + webWasm2023: 0 scriptingDefineSymbols: Android: UNITY_POST_PROCESSING_STACK_V2 CloudRendering: UNITY_POST_PROCESSING_STACK_V2 @@ -823,6 +834,7 @@ PlayerSettings: PS4: UNITY_POST_PROCESSING_STACK_V2 PS5: UNITY_POST_PROCESSING_STACK_V2 QNX: UNITY_POST_PROCESSING_STACK_V2 + ReservedCFE: UNITY_POST_PROCESSING_STACK_V2 Stadia: UNITY_POST_PROCESSING_STACK_V2 Standalone: UNITY_POST_PROCESSING_STACK_V2 VisionOS: UNITY_POST_PROCESSING_STACK_V2 @@ -836,6 +848,7 @@ PlayerSettings: WebGL: 1 il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} + il2cppStacktraceInformation: {} managedStrippingLevel: EmbeddedLinux: 1 GameCoreScarlett: 1 @@ -859,6 +872,7 @@ PlayerSettings: gcIncremental: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} + editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: 2d @@ -882,6 +896,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0, g: 0, b: 0, a: 1} metroSplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: @@ -939,9 +954,11 @@ PlayerSettings: hmiPlayerDataPath: hmiForceSRGBBlit: 1 embeddedLinuxEnableGamepadInput: 1 - hmiLogStartupTiming: 0 hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: apiCompatibilityLevel: 6 + captureStartupLogs: {} activeInputHandler: 0 windowsGamepadBackendHint: 0 cloudProjectId: @@ -955,3 +972,5 @@ PlayerSettings: platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 insecureHttpOption: 0 + androidVulkanDenyFilterList: [] + androidVulkanAllowFilterList: [] diff --git a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt b/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt index 9efb20c7a..76dad2cb2 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt +++ b/Basic/2DSpaceShooter/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/2DSpaceShooter/ProjectSettings/ShaderGraphSettings.asset b/Basic/2DSpaceShooter/ProjectSettings/ShaderGraphSettings.asset index 3250b068e..e66042a7c 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ShaderGraphSettings.asset +++ b/Basic/2DSpaceShooter/ProjectSettings/ShaderGraphSettings.asset @@ -15,3 +15,4 @@ MonoBehaviour: shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 + customHeatmapValues: {fileID: 0} diff --git a/Basic/2DSpaceShooter/ProjectSettings/TagManager.asset b/Basic/2DSpaceShooter/ProjectSettings/TagManager.asset index 6585d4851..6806d7b85 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/TagManager.asset +++ b/Basic/2DSpaceShooter/ProjectSettings/TagManager.asset @@ -2,7 +2,7 @@ %TAG !u! tag:unity3d.com,2011: --- !u!78 &1 TagManager: - serializedVersion: 2 + serializedVersion: 3 tags: - ObjectPool - Wall @@ -65,3 +65,12 @@ TagManager: - name: Ship uniqueID: 1115722359 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/2DSpaceShooter/ProjectSettings/URPProjectSettings.asset b/Basic/2DSpaceShooter/ProjectSettings/URPProjectSettings.asset index cd7fd8c61..08faf0336 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/URPProjectSettings.asset +++ b/Basic/2DSpaceShooter/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/2DSpaceShooter/ProjectSettings/VirtualProjectsConfig.json b/Basic/2DSpaceShooter/ProjectSettings/VirtualProjectsConfig.json new file mode 100644 index 000000000..1c43509ad --- /dev/null +++ b/Basic/2DSpaceShooter/ProjectSettings/VirtualProjectsConfig.json @@ -0,0 +1,4 @@ +{ + "PlayerTags": [], + "version": "1.3.2" +} \ No newline at end of file diff --git a/Basic/2DSpaceShooter/README.md b/Basic/2DSpaceShooter/README.md index 5a9a652c0..e949885ca 100644 --- a/Basic/2DSpaceShooter/README.md +++ b/Basic/2DSpaceShooter/README.md @@ -3,7 +3,7 @@ # 2D Space Shooter -[![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.28#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 067e38ab1..076446395 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. +### 2D Space Shooter + +#### Changed +- Update Project to Unity 6 +- Replaced 3rd party ParrelSync package with Unity's Multiplayer Play Mode + ### Client Driven #### Changed