Skip to content

Commit 99e865b

Browse files
nuskey8nuskey8
authored
Merge pull request #136 from AnnulusGames/update-unity-project
Update to Unity 6 (6000)
2 parents b6002a2 + c34feaa commit 99e865b

File tree

4 files changed

+71
-46
lines changed

4 files changed

+71
-46
lines changed

‎src/LitMotion/Packages/manifest.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
"com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
55
"com.cysharp.zstring": "https://github.com/Cysharp/ZString.git?path=src/ZString.Unity/Assets/Scripts/ZString",
66
"com.neuecc.unirx": "https://github.com/neuecc/UniRx.git?path=Assets/Plugins/UniRx/Scripts",
7-
"com.unity.collab-proxy": "2.2.0",
7+
"com.unity.collab-proxy": "2.5.2",
88
"com.unity.feature.development": "1.0.2",
99
"com.unity.ide.visualstudio": "2.0.22",
10-
"com.unity.logging": "1.0.16",
11-
"com.unity.timeline": "1.8.6",
12-
"com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.0",
10+
"com.unity.logging": "1.3.2",
11+
"com.unity.multiplayer.center": "1.0.0",
12+
"com.unity.timeline": "1.8.7",
13+
"com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.3",
1314
"com.unity.ugui": "2.0.0",
14-
"com.unity.visualeffectgraph": "16.0.4",
15-
"com.unity.visualscripting": "1.8.0",
15+
"com.unity.visualeffectgraph": "17.0.3",
16+
"com.unity.visualscripting": "1.9.4",
1617
"org.nuget.microsoft.bcl.timeprovider": "8.0.1",
1718
"org.nuget.r3": "1.1.10",
1819
"org.nuget.system.componentmodel.annotations": "5.0.0",

‎src/LitMotion/Packages/packages-lock.json

Lines changed: 59 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,31 @@
3131
"hash": "284d5c50d3f1ddd9fa7df3d382ea904732a9c2ff"
3232
},
3333
"com.unity.burst": {
34-
"version": "1.8.11",
34+
"version": "1.8.18",
3535
"depth": 1,
3636
"source": "registry",
3737
"dependencies": {
38-
"com.unity.mathematics": "1.2.1"
38+
"com.unity.mathematics": "1.2.1",
39+
"com.unity.modules.jsonserialize": "1.0.0"
3940
},
4041
"url": "https://packages.unity.com"
4142
},
4243
"com.unity.collab-proxy": {
43-
"version": "2.2.0",
44+
"version": "2.5.2",
4445
"depth": 0,
4546
"source": "registry",
4647
"dependencies": {},
4748
"url": "https://packages.unity.com"
4849
},
4950
"com.unity.collections": {
50-
"version": "2.1.4",
51+
"version": "2.5.1",
5152
"depth": 1,
5253
"source": "registry",
5354
"dependencies": {
54-
"com.unity.burst": "1.8.4",
55-
"com.unity.modules.unityanalytics": "1.0.0",
56-
"com.unity.nuget.mono-cecil": "1.11.4"
55+
"com.unity.burst": "1.8.17",
56+
"com.unity.test-framework": "1.4.5",
57+
"com.unity.nuget.mono-cecil": "1.11.4",
58+
"com.unity.test-framework.performance": "3.0.3"
5759
},
5860
"url": "https://packages.unity.com"
5961
},
@@ -77,15 +79,15 @@
7779
"source": "builtin",
7880
"dependencies": {
7981
"com.unity.ide.visualstudio": "2.0.22",
80-
"com.unity.ide.rider": "3.0.26",
82+
"com.unity.ide.rider": "3.0.31",
8183
"com.unity.editorcoroutines": "1.0.0",
8284
"com.unity.performance.profile-analyzer": "1.2.2",
83-
"com.unity.test-framework": "1.3.9",
84-
"com.unity.testtools.codecoverage": "1.2.4"
85+
"com.unity.test-framework": "1.4.5",
86+
"com.unity.testtools.codecoverage": "1.2.6"
8587
}
8688
},
8789
"com.unity.ide.rider": {
88-
"version": "3.0.26",
90+
"version": "3.0.31",
8991
"depth": 1,
9092
"source": "registry",
9193
"dependencies": {
@@ -103,22 +105,30 @@
103105
"url": "https://packages.unity.com"
104106
},
105107
"com.unity.logging": {
106-
"version": "1.0.16",
108+
"version": "1.3.2",
107109
"depth": 0,
108110
"source": "registry",
109111
"dependencies": {
110-
"com.unity.burst": "1.8.8",
111-
"com.unity.collections": "2.1.4"
112+
"com.unity.burst": "1.8.17",
113+
"com.unity.collections": "2.5.1"
112114
},
113115
"url": "https://packages.unity.com"
114116
},
115117
"com.unity.mathematics": {
116-
"version": "1.2.6",
118+
"version": "1.3.2",
117119
"depth": 2,
118120
"source": "registry",
119121
"dependencies": {},
120122
"url": "https://packages.unity.com"
121123
},
124+
"com.unity.multiplayer.center": {
125+
"version": "1.0.0",
126+
"depth": 0,
127+
"source": "builtin",
128+
"dependencies": {
129+
"com.unity.modules.uielements": "1.0.0"
130+
}
131+
},
122132
"com.unity.nuget.mono-cecil": {
123133
"version": "1.11.4",
124134
"depth": 2,
@@ -134,26 +144,28 @@
134144
"url": "https://packages.unity.com"
135145
},
136146
"com.unity.render-pipelines.core": {
137-
"version": "16.0.4",
147+
"version": "17.0.3",
138148
"depth": 1,
139149
"source": "builtin",
140150
"dependencies": {
141-
"com.unity.mathematics": "1.2.4",
151+
"com.unity.burst": "1.8.14",
152+
"com.unity.mathematics": "1.3.2",
142153
"com.unity.ugui": "2.0.0",
154+
"com.unity.collections": "2.4.3",
143155
"com.unity.modules.physics": "1.0.0",
144156
"com.unity.modules.terrain": "1.0.0",
145157
"com.unity.modules.jsonserialize": "1.0.0",
146-
"com.unity.rendering.light-transport": "1.0.0"
158+
"com.unity.rendering.light-transport": "1.0.1"
147159
}
148160
},
149161
"com.unity.rendering.light-transport": {
150-
"version": "1.0.0",
162+
"version": "1.0.1",
151163
"depth": 2,
152164
"source": "builtin",
153165
"dependencies": {
154-
"com.unity.collections": "1.4.0",
166+
"com.unity.collections": "2.2.0",
155167
"com.unity.mathematics": "1.2.4",
156-
"com.unity.render-pipelines.core": "16.0.1"
168+
"com.unity.modules.terrain": "1.0.0"
157169
}
158170
},
159171
"com.unity.searcher": {
@@ -171,32 +183,32 @@
171183
"url": "https://packages.unity.com"
172184
},
173185
"com.unity.shadergraph": {
174-
"version": "16.0.4",
186+
"version": "17.0.3",
175187
"depth": 1,
176188
"source": "builtin",
177189
"dependencies": {
178-
"com.unity.render-pipelines.core": "16.0.4",
190+
"com.unity.render-pipelines.core": "17.0.3",
179191
"com.unity.searcher": "4.9.2"
180192
}
181193
},
182194
"com.unity.sysroot": {
183-
"version": "2.0.7",
195+
"version": "2.0.10",
184196
"depth": 1,
185197
"source": "registry",
186198
"dependencies": {},
187199
"url": "https://packages.unity.com"
188200
},
189201
"com.unity.sysroot.linux-x86_64": {
190-
"version": "2.0.6",
202+
"version": "2.0.9",
191203
"depth": 1,
192204
"source": "registry",
193205
"dependencies": {
194-
"com.unity.sysroot": "2.0.7"
206+
"com.unity.sysroot": "2.0.10"
195207
},
196208
"url": "https://packages.unity.com"
197209
},
198210
"com.unity.test-framework": {
199-
"version": "1.3.9",
211+
"version": "1.4.5",
200212
"depth": 1,
201213
"source": "registry",
202214
"dependencies": {
@@ -206,8 +218,18 @@
206218
},
207219
"url": "https://packages.unity.com"
208220
},
221+
"com.unity.test-framework.performance": {
222+
"version": "3.0.3",
223+
"depth": 2,
224+
"source": "registry",
225+
"dependencies": {
226+
"com.unity.test-framework": "1.1.31",
227+
"com.unity.modules.jsonserialize": "1.0.0"
228+
},
229+
"url": "https://packages.unity.com"
230+
},
209231
"com.unity.testtools.codecoverage": {
210-
"version": "1.2.4",
232+
"version": "1.2.6",
211233
"depth": 1,
212234
"source": "registry",
213235
"dependencies": {
@@ -217,24 +239,24 @@
217239
"url": "https://packages.unity.com"
218240
},
219241
"com.unity.timeline": {
220-
"version": "1.8.6",
242+
"version": "1.8.7",
221243
"depth": 0,
222244
"source": "registry",
223245
"dependencies": {
246+
"com.unity.modules.audio": "1.0.0",
224247
"com.unity.modules.director": "1.0.0",
225248
"com.unity.modules.animation": "1.0.0",
226-
"com.unity.modules.audio": "1.0.0",
227249
"com.unity.modules.particlesystem": "1.0.0"
228250
},
229251
"url": "https://packages.unity.com"
230252
},
231253
"com.unity.toolchain.macos-arm64-linux-x86_64": {
232-
"version": "2.0.0",
254+
"version": "2.0.3",
233255
"depth": 0,
234256
"source": "registry",
235257
"dependencies": {
236-
"com.unity.sysroot": "2.0.7",
237-
"com.unity.sysroot.linux-x86_64": "2.0.6"
258+
"com.unity.sysroot": "2.0.10",
259+
"com.unity.sysroot.linux-x86_64": "2.0.9"
238260
},
239261
"url": "https://packages.unity.com"
240262
},
@@ -248,16 +270,16 @@
248270
}
249271
},
250272
"com.unity.visualeffectgraph": {
251-
"version": "16.0.4",
273+
"version": "17.0.3",
252274
"depth": 0,
253275
"source": "builtin",
254276
"dependencies": {
255-
"com.unity.shadergraph": "16.0.4",
256-
"com.unity.render-pipelines.core": "16.0.4"
277+
"com.unity.shadergraph": "17.0.3",
278+
"com.unity.render-pipelines.core": "17.0.3"
257279
}
258280
},
259281
"com.unity.visualscripting": {
260-
"version": "1.8.0",
282+
"version": "1.9.4",
261283
"depth": 0,
262284
"source": "registry",
263285
"dependencies": {

‎src/LitMotion/ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2023.2.3f1
2-
m_EditorVersionWithRevision: 2023.2.3f1 (21747dafc6ee)
1+
m_EditorVersion: 6000.0.23f1
2+
m_EditorVersionWithRevision: 6000.0.23f1 (1c4764c07fb4)

‎src/LitMotion/ProjectSettings/VFXManager.asset

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ VFXManager:
77
m_CopyBufferShader: {fileID: 7200000, guid: 23c51f21a3503f6428b527b01f8a2f4e, type: 3}
88
m_SortShader: {fileID: 7200000, guid: ea257ca3cfb12a642a5025e612af6b2a, type: 3}
99
m_StripUpdateShader: {fileID: 7200000, guid: 8fa6c4009fe2a4d4486c62736fc30ad8, type: 3}
10+
m_EmptyShader: {fileID: 4800000, guid: 33a2079f6a2db4c4eb2e44b33f4ddf6b, type: 3}
1011
m_RenderPipeSettingsPath:
1112
m_FixedTimeStep: 0.016666668
1213
m_MaxDeltaTime: 0.05
1314
m_MaxScrubTime: 30
15+
m_MaxCapacity: 100000000
1416
m_CompiledVersion: 7
15-
m_RuntimeVersion: 34
17+
m_RuntimeVersion: 36
1618
m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2}
1719
m_BatchEmptyLifetime: 300

0 commit comments

Comments
 (0)