Skip to content

Commit 1bbd9a1

Browse files
committed
Update Unity from 2020.3.24f1 to 2021.3.13f1
1 parent aedc9ba commit 1bbd9a1

8 files changed

+1650
-1462
lines changed

Assembly-CSharp-Editor.csproj

Lines changed: 269 additions & 222 deletions
Large diffs are not rendered by default.

MackySoft.SerializeReferenceExtensions.Editor.csproj

Lines changed: 683 additions & 631 deletions
Large diffs are not rendered by default.

MackySoft.SerializeReferenceExtensions.csproj

Lines changed: 642 additions & 589 deletions
Large diffs are not rendered by default.

Packages/manifest.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": "1.15.4",
4-
"com.unity.ide.rider": "2.0.7",
5-
"com.unity.ide.visualstudio": "2.0.12",
6-
"com.unity.ide.vscode": "1.2.4",
7-
"com.unity.test-framework": "1.1.29",
3+
"com.unity.collab-proxy": "1.17.6",
4+
"com.unity.ide.rider": "3.0.15",
5+
"com.unity.ide.visualstudio": "2.0.16",
6+
"com.unity.ide.vscode": "1.2.5",
7+
"com.unity.test-framework": "1.1.31",
88
"com.unity.textmeshpro": "3.0.6",
9-
"com.unity.timeline": "1.4.8",
9+
"com.unity.timeline": "1.6.4",
1010
"com.unity.ugui": "1.0.0",
1111
"com.unity.modules.ai": "1.0.0",
1212
"com.unity.modules.androidjni": "1.0.0",

Packages/packages-lock.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
22
"dependencies": {
33
"com.unity.collab-proxy": {
4-
"version": "1.15.4",
4+
"version": "1.17.6",
55
"depth": 0,
66
"source": "registry",
77
"dependencies": {
8-
"com.unity.nuget.newtonsoft-json": "2.0.0",
98
"com.unity.services.core": "1.0.1"
109
},
1110
"url": "https://packages.unity.com"
@@ -18,16 +17,16 @@
1817
"url": "https://packages.unity.com"
1918
},
2019
"com.unity.ide.rider": {
21-
"version": "2.0.7",
20+
"version": "3.0.15",
2221
"depth": 0,
2322
"source": "registry",
2423
"dependencies": {
25-
"com.unity.test-framework": "1.1.1"
24+
"com.unity.ext.nunit": "1.0.6"
2625
},
2726
"url": "https://packages.unity.com"
2827
},
2928
"com.unity.ide.visualstudio": {
30-
"version": "2.0.12",
29+
"version": "2.0.16",
3130
"depth": 0,
3231
"source": "registry",
3332
"dependencies": {
@@ -36,30 +35,32 @@
3635
"url": "https://packages.unity.com"
3736
},
3837
"com.unity.ide.vscode": {
39-
"version": "1.2.4",
38+
"version": "1.2.5",
4039
"depth": 0,
4140
"source": "registry",
4241
"dependencies": {},
4342
"url": "https://packages.unity.com"
4443
},
4544
"com.unity.nuget.newtonsoft-json": {
46-
"version": "2.0.0",
47-
"depth": 1,
45+
"version": "3.0.2",
46+
"depth": 2,
4847
"source": "registry",
4948
"dependencies": {},
5049
"url": "https://packages.unity.com"
5150
},
5251
"com.unity.services.core": {
53-
"version": "1.0.1",
52+
"version": "1.5.2",
5453
"depth": 1,
5554
"source": "registry",
5655
"dependencies": {
57-
"com.unity.modules.unitywebrequest": "1.0.0"
56+
"com.unity.modules.unitywebrequest": "1.0.0",
57+
"com.unity.nuget.newtonsoft-json": "3.0.2",
58+
"com.unity.modules.androidjni": "1.0.0"
5859
},
5960
"url": "https://packages.unity.com"
6061
},
6162
"com.unity.test-framework": {
62-
"version": "1.1.29",
63+
"version": "1.1.31",
6364
"depth": 0,
6465
"source": "registry",
6566
"dependencies": {
@@ -79,7 +80,7 @@
7980
"url": "https://packages.unity.com"
8081
},
8182
"com.unity.timeline": {
82-
"version": "1.4.8",
83+
"version": "1.6.4",
8384
"depth": 0,
8485
"source": "registry",
8586
"dependencies": {

ProjectSettings/MemorySettings.asset

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!387306366 &1
4+
MemorySettings:
5+
m_ObjectHideFlags: 0
6+
m_EditorMemorySettings:
7+
m_MainAllocatorBlockSize: -1
8+
m_ThreadAllocatorBlockSize: -1
9+
m_MainGfxBlockSize: -1
10+
m_ThreadGfxBlockSize: -1
11+
m_CacheBlockSize: -1
12+
m_TypetreeBlockSize: -1
13+
m_ProfilerBlockSize: -1
14+
m_ProfilerEditorBlockSize: -1
15+
m_BucketAllocatorGranularity: -1
16+
m_BucketAllocatorBucketsCount: -1
17+
m_BucketAllocatorBlockSize: -1
18+
m_BucketAllocatorBlockCount: -1
19+
m_ProfilerBucketAllocatorGranularity: -1
20+
m_ProfilerBucketAllocatorBucketsCount: -1
21+
m_ProfilerBucketAllocatorBlockSize: -1
22+
m_ProfilerBucketAllocatorBlockCount: -1
23+
m_TempAllocatorSizeMain: -1
24+
m_JobTempAllocatorBlockSize: -1
25+
m_BackgroundJobTempAllocatorBlockSize: -1
26+
m_JobTempAllocatorReducedBlockSize: -1
27+
m_TempAllocatorSizeGIBakingWorker: -1
28+
m_TempAllocatorSizeNavMeshWorker: -1
29+
m_TempAllocatorSizeAudioWorker: -1
30+
m_TempAllocatorSizeCloudWorker: -1
31+
m_TempAllocatorSizeGfx: -1
32+
m_TempAllocatorSizeJobWorker: -1
33+
m_TempAllocatorSizeBackgroundWorker: -1
34+
m_TempAllocatorSizePreloadManager: -1
35+
m_PlatformMemorySettings: {}

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.24f1
2-
m_EditorVersionWithRevision: 2020.3.24f1 (79c78de19888)
1+
m_EditorVersion: 2021.3.13f1
2+
m_EditorVersionWithRevision: 2021.3.13f1 (9e7d58001ecf)

ProjectSettings/boot.config

Whitespace-only changes.

0 commit comments

Comments
 (0)