Skip to content

Commit aca8244

Browse files
xdesiletsxdesilets
authored
Merge pull request #30 from Unity-Technologies/xd/update-versions-6000.0.58f2
Updating samples editor versions.
2 parents 93e4a78 + 6728451 commit aca8244

File tree

57 files changed

+1454
-2216
lines changed

Some content is hidden

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

57 files changed

+1454
-2216
lines changed

‎BlazeDetectionSample/Face/Assets/Materials/Keypoint.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ MonoBehaviour:
109109
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
110110
m_Name:
111111
m_EditorClassIdentifier:
112-
version: 9
112+
version: 10

‎BlazeDetectionSample/Face/Assets/Materials/Line.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ MonoBehaviour:
133133
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
134134
m_Name:
135135
m_EditorClassIdentifier:
136-
version: 9
136+
version: 10

‎BlazeDetectionSample/Face/Assets/Materials/ground.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 9
15+
version: 10
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8

‎BlazeDetectionSample/Face/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ MonoBehaviour:
5555
- rid: 5094402518654124032
5656
- rid: 5094402518654124033
5757
- rid: 7979239815919173632
58+
- rid: 8604051874077737163
59+
- rid: 8604051874077737164
60+
- rid: 8604051874077737165
61+
- rid: 8604051874077737166
5862
m_RuntimeSettings:
5963
m_List: []
6064
m_AssetVersion: 8
@@ -262,3 +266,90 @@ MonoBehaviour:
262266
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
263267
data:
264268
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
269+
- rid: 8604051874077737163
270+
type: {class: ScreenSpaceAmbientOcclusionPersistentResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
271+
data:
272+
m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
273+
m_Version: 0
274+
- rid: 8604051874077737164
275+
type: {class: PostProcessData/TextureResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
276+
data:
277+
blueNoise16LTex:
278+
- {fileID: 2800000, guid: 81200413a40918d4d8702e94db29911c, type: 3}
279+
- {fileID: 2800000, guid: d50c5e07c9911a74982bddf7f3075e7b, type: 3}
280+
- {fileID: 2800000, guid: 1134690bf9216164dbc75050e35b7900, type: 3}
281+
- {fileID: 2800000, guid: 7ce2118f74614a94aa8a0cdf2e6062c3, type: 3}
282+
- {fileID: 2800000, guid: 2ca97df9d1801e84a8a8f2c53cb744f0, type: 3}
283+
- {fileID: 2800000, guid: e63eef8f54aa9dc4da9a5ac094b503b5, type: 3}
284+
- {fileID: 2800000, guid: 39451254daebd6d40b52899c1f1c0c1b, type: 3}
285+
- {fileID: 2800000, guid: c94ad916058dff743b0f1c969ddbe660, type: 3}
286+
- {fileID: 2800000, guid: ed5ea7ce59ca8ec4f9f14bf470a30f35, type: 3}
287+
- {fileID: 2800000, guid: 071e954febf155243a6c81e48f452644, type: 3}
288+
- {fileID: 2800000, guid: 96aaab9cc247d0b4c98132159688c1af, type: 3}
289+
- {fileID: 2800000, guid: fc3fa8f108657e14486697c9a84ccfc5, type: 3}
290+
- {fileID: 2800000, guid: bfed3e498947fcb4890b7f40f54d85b9, type: 3}
291+
- {fileID: 2800000, guid: d512512f4af60a442ab3458489412954, type: 3}
292+
- {fileID: 2800000, guid: 47a45908f6db0cb44a0d5e961143afec, type: 3}
293+
- {fileID: 2800000, guid: 4dcc0502f8586f941b5c4a66717205e8, type: 3}
294+
- {fileID: 2800000, guid: 9d92991794bb5864c8085468b97aa067, type: 3}
295+
- {fileID: 2800000, guid: 14381521ff11cb74abe3fe65401c23be, type: 3}
296+
- {fileID: 2800000, guid: d36f0fe53425e08499a2333cf423634c, type: 3}
297+
- {fileID: 2800000, guid: d4044ea2490d63b43aa1765f8efbf8a9, type: 3}
298+
- {fileID: 2800000, guid: c9bd74624d8070f429e3f46d161f9204, type: 3}
299+
- {fileID: 2800000, guid: d5c9b274310e5524ebe32a4e4da3df1f, type: 3}
300+
- {fileID: 2800000, guid: f69770e54f2823f43badf77916acad83, type: 3}
301+
- {fileID: 2800000, guid: 10b6c6d22e73dea46a8ab36b6eebd629, type: 3}
302+
- {fileID: 2800000, guid: a2ec5cbf5a9b64345ad3fab0912ddf7b, type: 3}
303+
- {fileID: 2800000, guid: 1c3c6d69a645b804fa232004b96b7ad3, type: 3}
304+
- {fileID: 2800000, guid: d18a24d7b4ed50f4387993566d9d3ae2, type: 3}
305+
- {fileID: 2800000, guid: c989e1ed85cf7154caa922fec53e6af6, type: 3}
306+
- {fileID: 2800000, guid: ff47e5a0f105eb34883b973e51f4db62, type: 3}
307+
- {fileID: 2800000, guid: fa042edbfc40fbd4bad0ab9d505b1223, type: 3}
308+
- {fileID: 2800000, guid: 896d9004736809c4fb5973b7c12eb8b9, type: 3}
309+
- {fileID: 2800000, guid: 179f794063d2a66478e6e726f84a65bc, type: 3}
310+
filmGrainTex:
311+
- {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3}
312+
- {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3}
313+
- {fileID: 2800000, guid: 1097e90e1306e26439701489f391a6c0, type: 3}
314+
- {fileID: 2800000, guid: f0b67500f7fad3b4c9f2b13e8f41ba6e, type: 3}
315+
- {fileID: 2800000, guid: 9930fb4528622b34687b00bbe6883de7, type: 3}
316+
- {fileID: 2800000, guid: bd9e8c758250ef449a4b4bfaad7a2133, type: 3}
317+
- {fileID: 2800000, guid: 510a2f57334933e4a8dbabe4c30204e4, type: 3}
318+
- {fileID: 2800000, guid: b4db8180660810945bf8d55ab44352ad, type: 3}
319+
- {fileID: 2800000, guid: fd2fd78b392986e42a12df2177d3b89c, type: 3}
320+
- {fileID: 2800000, guid: 5cdee82a77d13994f83b8fdabed7c301, type: 3}
321+
smaaAreaTex: {fileID: 2800000, guid: d1f1048909d55cd4fa1126ab998f617e, type: 3}
322+
smaaSearchTex: {fileID: 2800000, guid: 51eee22c2a633ef4aada830eed57c3fd, type: 3}
323+
m_TexturesResourcesVersion: 0
324+
- rid: 8604051874077737165
325+
type: {class: ScreenSpaceAmbientOcclusionDynamicResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
326+
data:
327+
m_BlueNoise256Textures:
328+
- {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3}
329+
- {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3}
330+
- {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3}
331+
- {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3}
332+
- {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3}
333+
- {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3}
334+
- {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3}
335+
m_Version: 0
336+
- rid: 8604051874077737166
337+
type: {class: PostProcessData/ShaderResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
338+
data:
339+
stopNanPS: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3}
340+
subpixelMorphologicalAntialiasingPS: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3}
341+
gaussianDepthOfFieldPS: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, type: 3}
342+
bokehDepthOfFieldPS: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, type: 3}
343+
cameraMotionBlurPS: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, type: 3}
344+
paniniProjectionPS: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, type: 3}
345+
lutBuilderLdrPS: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3}
346+
lutBuilderHdrPS: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3}
347+
bloomPS: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3}
348+
temporalAntialiasingPS: {fileID: 4800000, guid: 9c70c1a35ff15f340b38ea84842358bf, type: 3}
349+
LensFlareDataDrivenPS: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3}
350+
LensFlareScreenSpacePS: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, type: 3}
351+
scalingSetupPS: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, type: 3}
352+
easuPS: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3}
353+
uberPostPS: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3}
354+
finalPostPassPS: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, type: 3}
355+
m_ShaderResourcesVersion: 0

‎BlazeDetectionSample/Face/Packages/manifest.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"dependencies": {
3-
"com.unity.ai.inference": "2.2.0",
4-
"com.unity.ai.navigation": "2.0.6",
5-
"com.unity.collab-proxy": "2.7.1",
6-
"com.unity.ide.rider": "3.0.31",
7-
"com.unity.ide.visualstudio": "2.0.22",
8-
"com.unity.inputsystem": "1.13.0",
3+
"com.unity.ai.inference": "2.3.0",
4+
"com.unity.ai.navigation": "2.0.9",
5+
"com.unity.collab-proxy": "2.9.3",
6+
"com.unity.ide.rider": "3.0.38",
7+
"com.unity.ide.visualstudio": "2.0.25",
8+
"com.unity.inputsystem": "1.14.2",
99
"com.unity.multiplayer.center": "1.0.0",
1010
"com.unity.render-pipelines.universal": "17.0.4",
1111
"com.unity.test-framework": "1.4.6",
12-
"com.unity.timeline": "1.8.7",
12+
"com.unity.timeline": "1.8.9",
1313
"com.unity.ugui": "2.0.0",
14-
"com.unity.visualscripting": "1.9.5",
14+
"com.unity.visualscripting": "1.9.9",
1515
"com.unity.modules.accessibility": "1.0.0",
1616
"com.unity.modules.ai": "1.0.0",
1717
"com.unity.modules.androidjni": "1.0.0",

‎BlazeDetectionSample/Face/Packages/packages-lock.json‎

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
"dependencies": {
33
"com.unity.ai.inference": {
4-
"version": "2.2.0",
4+
"version": "2.3.0",
55
"depth": 0,
66
"source": "registry",
77
"dependencies": {
88
"com.unity.burst": "1.8.17",
9+
"com.unity.dt.app-ui": "1.3.1",
910
"com.unity.collections": "2.4.3",
1011
"com.unity.modules.imageconversion": "1.0.0"
1112
},
1213
"url": "https://packages.unity.com"
1314
},
1415
"com.unity.ai.navigation": {
15-
"version": "2.0.6",
16+
"version": "2.0.9",
1617
"depth": 0,
1718
"source": "registry",
1819
"dependencies": {
@@ -21,7 +22,7 @@
2122
"url": "https://packages.unity.com"
2223
},
2324
"com.unity.burst": {
24-
"version": "1.8.19",
25+
"version": "1.8.24",
2526
"depth": 1,
2627
"source": "registry",
2728
"dependencies": {
@@ -31,7 +32,7 @@
3132
"url": "https://packages.unity.com"
3233
},
3334
"com.unity.collab-proxy": {
34-
"version": "2.7.1",
35+
"version": "2.9.3",
3536
"depth": 0,
3637
"source": "registry",
3738
"dependencies": {},
@@ -49,15 +50,26 @@
4950
},
5051
"url": "https://packages.unity.com"
5152
},
52-
"com.unity.ext.nunit": {
53-
"version": "2.0.5",
53+
"com.unity.dt.app-ui": {
54+
"version": "1.3.1",
5455
"depth": 1,
5556
"source": "registry",
56-
"dependencies": {},
57+
"dependencies": {
58+
"com.unity.modules.physics": "1.0.0",
59+
"com.unity.modules.androidjni": "1.0.0",
60+
"com.unity.modules.uielements": "1.0.0",
61+
"com.unity.modules.screencapture": "1.0.0"
62+
},
5763
"url": "https://packages.unity.com"
5864
},
65+
"com.unity.ext.nunit": {
66+
"version": "2.0.5",
67+
"depth": 1,
68+
"source": "builtin",
69+
"dependencies": {}
70+
},
5971
"com.unity.ide.rider": {
60-
"version": "3.0.31",
72+
"version": "3.0.38",
6173
"depth": 0,
6274
"source": "registry",
6375
"dependencies": {
@@ -66,16 +78,16 @@
6678
"url": "https://packages.unity.com"
6779
},
6880
"com.unity.ide.visualstudio": {
69-
"version": "2.0.22",
81+
"version": "2.0.25",
7082
"depth": 0,
7183
"source": "registry",
7284
"dependencies": {
73-
"com.unity.test-framework": "1.1.9"
85+
"com.unity.test-framework": "1.1.31"
7486
},
7587
"url": "https://packages.unity.com"
7688
},
7789
"com.unity.inputsystem": {
78-
"version": "1.13.0",
90+
"version": "1.14.2",
7991
"depth": 0,
8092
"source": "registry",
8193
"dependencies": {
@@ -110,7 +122,7 @@
110122
"depth": 1,
111123
"source": "builtin",
112124
"dependencies": {
113-
"com.unity.burst": "1.8.14",
125+
"com.unity.burst": "1.8.20",
114126
"com.unity.mathematics": "1.3.2",
115127
"com.unity.ugui": "2.0.0",
116128
"com.unity.collections": "2.4.3",
@@ -165,28 +177,27 @@
165177
}
166178
},
167179
"com.unity.test-framework": {
168-
"version": "1.4.6",
180+
"version": "1.5.1",
169181
"depth": 0,
170-
"source": "registry",
182+
"source": "builtin",
171183
"dependencies": {
172184
"com.unity.ext.nunit": "2.0.3",
173185
"com.unity.modules.imgui": "1.0.0",
174186
"com.unity.modules.jsonserialize": "1.0.0"
175-
},
176-
"url": "https://packages.unity.com"
187+
}
177188
},
178189
"com.unity.test-framework.performance": {
179-
"version": "3.0.3",
190+
"version": "3.1.0",
180191
"depth": 2,
181192
"source": "registry",
182193
"dependencies": {
183-
"com.unity.test-framework": "1.1.31",
194+
"com.unity.test-framework": "1.1.33",
184195
"com.unity.modules.jsonserialize": "1.0.0"
185196
},
186197
"url": "https://packages.unity.com"
187198
},
188199
"com.unity.timeline": {
189-
"version": "1.8.7",
200+
"version": "1.8.9",
190201
"depth": 0,
191202
"source": "registry",
192203
"dependencies": {
@@ -207,7 +218,7 @@
207218
}
208219
},
209220
"com.unity.visualscripting": {
210-
"version": "1.9.5",
221+
"version": "1.9.9",
211222
"depth": 0,
212223
"source": "registry",
213224
"dependencies": {

‎BlazeDetectionSample/Face/ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 6000.0.40f1
2-
m_EditorVersionWithRevision: 6000.0.40f1 (157d81624ddf)
1+
m_EditorVersion: 6000.0.58f2
2+
m_EditorVersionWithRevision: 6000.0.58f2 (92dee566b325)

‎BlazeDetectionSample/Face/ProjectSettings/ShaderGraphSettings.asset‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ MonoBehaviour:
1313
m_Name:
1414
m_EditorClassIdentifier:
1515
shaderVariantLimit: 128
16+
overrideShaderVariantLimit: 0
1617
customInterpolatorErrorThreshold: 32
1718
customInterpolatorWarningThreshold: 16
1819
customHeatmapValues: {fileID: 0}

‎BlazeDetectionSample/Face/ProjectSettings/URPProjectSettings.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
m_LastMaterialVersion: 9
15+
m_LastMaterialVersion: 10

‎BlazeDetectionSample/Hand/Assets/Materials/Keypoint.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ MonoBehaviour:
109109
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
110110
m_Name:
111111
m_EditorClassIdentifier:
112-
version: 9
112+
version: 10

0 commit comments

Comments
 (0)