Skip to content

Commit f771e88

Browse files
FireDragonGameStudioFireDragonGameStudio
authored
Merge pull request #11 from FireDragonGameStudio/update-to-6-2
update to unity 6.2 and webrtc 3.0.0
2 parents 07c0b01 + b2e71c8 commit f771e88

File tree

13 files changed

+50
-56
lines changed

13 files changed

+50
-56
lines changed

‎Assets/Settings/UniversalRenderPipelineGlobalSettings.asset‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,9 @@ MonoBehaviour:
6161
- rid: 7556929790737121283
6262
- rid: 7556929790737121284
6363
- rid: 7556929790737121285
64+
- rid: 6823573669256364032
6465
m_RuntimeSettings:
65-
m_List:
66-
- rid: 6852985685364965378
67-
- rid: 6852985685364965379
68-
- rid: 6852985685364965380
69-
- rid: 6852985685364965381
70-
- rid: 6852985685364965384
71-
- rid: 6852985685364965385
72-
- rid: 6852985685364965392
73-
- rid: 6852985685364965394
74-
- rid: 8712630790384254976
75-
- rid: 801588446733008896
76-
- rid: 7556929790737121284
66+
m_List: []
7767
m_AssetVersion: 8
7868
m_ObsoleteDefaultVolumeProfile: {fileID: 0}
7969
m_RenderingLayerNames:
@@ -123,9 +113,6 @@ MonoBehaviour:
123113
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
124114
m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3}
125115
m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3}
126-
m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3}
127-
m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3}
128-
m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3}
129116
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
130117
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
131118
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
@@ -218,6 +205,10 @@ MonoBehaviour:
218205
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
219206
data:
220207
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
208+
- rid: 6823573669256364032
209+
type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
210+
data:
211+
m_version: 0
221212
- rid: 6852985685364965378
222213
type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
223214
data:

‎Assets/SimpleWebRTC/Runtime/Materials/Black.mat‎

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

‎Assets/SimpleWebRTC/Runtime/Materials/Blue.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

‎Assets/SimpleWebRTC/Runtime/Materials/Green.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

‎Assets/SimpleWebRTC/Runtime/Materials/Red.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

‎Assets/SimpleWebRTC/Runtime/Materials/VideoReceiver_RT.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

‎Assets/SimpleWebRTC/Runtime/Materials/White.mat‎

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

‎Packages/manifest.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"dependencies": {
33
"com.endel.nativewebsocket": "https://github.com/endel/NativeWebSocket.git#upm",
4-
"com.unity.ai.navigation": "2.0.7",
5-
"com.unity.collab-proxy": "2.7.1",
6-
"com.unity.ide.rider": "3.0.36",
4+
"com.unity.ai.navigation": "2.0.9",
5+
"com.unity.collab-proxy": "2.9.3",
6+
"com.unity.ide.rider": "3.0.38",
77
"com.unity.ide.visualstudio": "2.0.23",
8-
"com.unity.inputsystem": "1.14.0",
8+
"com.unity.inputsystem": "1.14.2",
99
"com.unity.multiplayer.center": "1.0.0",
10-
"com.unity.nuget.mono-cecil": "1.11.5",
11-
"com.unity.render-pipelines.universal": "17.1.0",
12-
"com.unity.test-framework": "1.5.1",
13-
"com.unity.timeline": "1.8.8",
10+
"com.unity.nuget.mono-cecil": "1.11.6",
11+
"com.unity.render-pipelines.universal": "17.2.0",
12+
"com.unity.test-framework": "1.6.0",
13+
"com.unity.timeline": "1.8.9",
1414
"com.unity.ugui": "2.0.0",
15-
"com.unity.visualscripting": "1.9.7",
16-
"com.unity.webrtc": "3.0.0-pre.8",
15+
"com.unity.visualscripting": "1.9.8",
16+
"com.unity.webrtc": "3.0.0",
1717
"com.unity.modules.accessibility": "1.0.0",
1818
"com.unity.modules.ai": "1.0.0",
1919
"com.unity.modules.androidjni": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"hash": "c5101c07762251edc82caad9e8a39d51b1229c31"
99
},
1010
"com.unity.ai.navigation": {
11-
"version": "2.0.7",
11+
"version": "2.0.9",
1212
"depth": 0,
1313
"source": "registry",
1414
"dependencies": {
@@ -17,7 +17,7 @@
1717
"url": "https://packages.unity.com"
1818
},
1919
"com.unity.burst": {
20-
"version": "1.8.21",
20+
"version": "1.8.24",
2121
"depth": 2,
2222
"source": "registry",
2323
"dependencies": {
@@ -27,20 +27,21 @@
2727
"url": "https://packages.unity.com"
2828
},
2929
"com.unity.collab-proxy": {
30-
"version": "2.7.1",
30+
"version": "2.9.3",
3131
"depth": 0,
3232
"source": "registry",
3333
"dependencies": {},
3434
"url": "https://packages.unity.com"
3535
},
3636
"com.unity.collections": {
37-
"version": "2.5.1",
37+
"version": "2.5.7",
3838
"depth": 2,
3939
"source": "registry",
4040
"dependencies": {
41-
"com.unity.burst": "1.8.17",
42-
"com.unity.test-framework": "1.4.5",
43-
"com.unity.nuget.mono-cecil": "1.11.4",
41+
"com.unity.burst": "1.8.19",
42+
"com.unity.mathematics": "1.3.2",
43+
"com.unity.test-framework": "1.4.6",
44+
"com.unity.nuget.mono-cecil": "1.11.5",
4445
"com.unity.test-framework.performance": "3.0.3"
4546
},
4647
"url": "https://packages.unity.com"
@@ -59,7 +60,7 @@
5960
"dependencies": {}
6061
},
6162
"com.unity.ide.rider": {
62-
"version": "3.0.36",
63+
"version": "3.0.38",
6364
"depth": 0,
6465
"source": "registry",
6566
"dependencies": {
@@ -77,7 +78,7 @@
7778
"url": "https://packages.unity.com"
7879
},
7980
"com.unity.inputsystem": {
80-
"version": "1.14.0",
81+
"version": "1.14.2",
8182
"depth": 0,
8283
"source": "registry",
8384
"dependencies": {
@@ -101,14 +102,14 @@
101102
}
102103
},
103104
"com.unity.nuget.mono-cecil": {
104-
"version": "1.11.5",
105+
"version": "1.11.6",
105106
"depth": 0,
106107
"source": "registry",
107108
"dependencies": {},
108109
"url": "https://packages.unity.com"
109110
},
110111
"com.unity.render-pipelines.core": {
111-
"version": "17.1.0",
112+
"version": "17.2.0",
112113
"depth": 1,
113114
"source": "builtin",
114115
"dependencies": {
@@ -123,12 +124,12 @@
123124
}
124125
},
125126
"com.unity.render-pipelines.universal": {
126-
"version": "17.1.0",
127+
"version": "17.2.0",
127128
"depth": 0,
128129
"source": "builtin",
129130
"dependencies": {
130-
"com.unity.render-pipelines.core": "17.1.0",
131-
"com.unity.shadergraph": "17.1.0",
131+
"com.unity.render-pipelines.core": "17.2.0",
132+
"com.unity.shadergraph": "17.2.0",
132133
"com.unity.render-pipelines.universal-config": "17.0.3"
133134
}
134135
},
@@ -158,16 +159,16 @@
158159
"url": "https://packages.unity.com"
159160
},
160161
"com.unity.shadergraph": {
161-
"version": "17.1.0",
162+
"version": "17.2.0",
162163
"depth": 1,
163164
"source": "builtin",
164165
"dependencies": {
165-
"com.unity.render-pipelines.core": "17.1.0",
166+
"com.unity.render-pipelines.core": "17.2.0",
166167
"com.unity.searcher": "4.9.3"
167168
}
168169
},
169170
"com.unity.test-framework": {
170-
"version": "1.5.1",
171+
"version": "1.6.0",
171172
"depth": 0,
172173
"source": "builtin",
173174
"dependencies": {
@@ -187,7 +188,7 @@
187188
"url": "https://packages.unity.com"
188189
},
189190
"com.unity.timeline": {
190-
"version": "1.8.8",
191+
"version": "1.8.9",
191192
"depth": 0,
192193
"source": "registry",
193194
"dependencies": {
@@ -208,7 +209,7 @@
208209
}
209210
},
210211
"com.unity.visualscripting": {
211-
"version": "1.9.7",
212+
"version": "1.9.8",
212213
"depth": 0,
213214
"source": "registry",
214215
"dependencies": {
@@ -218,7 +219,7 @@
218219
"url": "https://packages.unity.com"
219220
},
220221
"com.unity.webrtc": {
221-
"version": "3.0.0-pre.8",
222+
"version": "3.0.0",
222223
"depth": 0,
223224
"source": "registry",
224225
"dependencies": {
@@ -376,7 +377,8 @@
376377
"com.unity.modules.ui": "1.0.0",
377378
"com.unity.modules.imgui": "1.0.0",
378379
"com.unity.modules.jsonserialize": "1.0.0",
379-
"com.unity.modules.hierarchycore": "1.0.0"
380+
"com.unity.modules.hierarchycore": "1.0.0",
381+
"com.unity.modules.physics": "1.0.0"
380382
}
381383
},
382384
"com.unity.modules.umbra": {

‎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.1.0f1
2-
m_EditorVersionWithRevision: 6000.1.0f1 (9ea152932a88)
1+
m_EditorVersion: 6000.2.6f2
2+
m_EditorVersionWithRevision: 6000.2.6f2 (4a4dcaec6541)

0 commit comments

Comments
 (0)