Skip to content

Commit 0d4f46d

Browse files
mackysoftmackysoft
authored
Merge pull request #31 from mackysoft/update-unity
Update unity
2 parents 763f588 + fe88d3a commit 0d4f46d

8 files changed

Lines changed: 2188 additions & 71 deletions

‎Assembly-CSharp-Editor.csproj‎

Lines changed: 730 additions & 0 deletions
Large diffs are not rendered by default.

‎MackySoft.SerializeReferenceExtensions.Editor.csproj‎

Lines changed: 723 additions & 0 deletions
Large diffs are not rendered by default.

‎MackySoft.SerializeReferenceExtensions.csproj‎

Lines changed: 689 additions & 0 deletions
Large diffs are not rendered by default.

‎Packages/manifest.json‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
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",
8-
"com.unity.textmeshpro": "3.0.6",
9-
"com.unity.timeline": "1.4.8",
10-
"com.unity.ugui": "1.0.0",
3+
"com.unity.ide.rider": "3.0.24",
4+
"com.unity.ide.visualstudio": "2.0.18",
5+
"com.unity.ide.vscode": "1.2.5",
6+
"com.unity.test-framework": "1.1.33",
117
"com.unity.modules.ai": "1.0.0",
128
"com.unity.modules.androidjni": "1.0.0",
139
"com.unity.modules.animation": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": {
4-
"version": "1.15.4",
5-
"depth": 0,
6-
"source": "registry",
7-
"dependencies": {
8-
"com.unity.nuget.newtonsoft-json": "2.0.0",
9-
"com.unity.services.core": "1.0.1"
10-
},
11-
"url": "https://packages.unity.com"
12-
},
133
"com.unity.ext.nunit": {
144
"version": "1.0.6",
155
"depth": 1,
@@ -18,16 +8,16 @@
188
"url": "https://packages.unity.com"
199
},
2010
"com.unity.ide.rider": {
21-
"version": "2.0.7",
11+
"version": "3.0.24",
2212
"depth": 0,
2313
"source": "registry",
2414
"dependencies": {
25-
"com.unity.test-framework": "1.1.1"
15+
"com.unity.ext.nunit": "1.0.6"
2616
},
2717
"url": "https://packages.unity.com"
2818
},
2919
"com.unity.ide.visualstudio": {
30-
"version": "2.0.12",
20+
"version": "2.0.18",
3121
"depth": 0,
3222
"source": "registry",
3323
"dependencies": {
@@ -36,30 +26,14 @@
3626
"url": "https://packages.unity.com"
3727
},
3828
"com.unity.ide.vscode": {
39-
"version": "1.2.4",
29+
"version": "1.2.5",
4030
"depth": 0,
4131
"source": "registry",
4232
"dependencies": {},
4333
"url": "https://packages.unity.com"
4434
},
45-
"com.unity.nuget.newtonsoft-json": {
46-
"version": "2.0.0",
47-
"depth": 1,
48-
"source": "registry",
49-
"dependencies": {},
50-
"url": "https://packages.unity.com"
51-
},
52-
"com.unity.services.core": {
53-
"version": "1.0.1",
54-
"depth": 1,
55-
"source": "registry",
56-
"dependencies": {
57-
"com.unity.modules.unitywebrequest": "1.0.0"
58-
},
59-
"url": "https://packages.unity.com"
60-
},
6135
"com.unity.test-framework": {
62-
"version": "1.1.29",
36+
"version": "1.1.33",
6337
"depth": 0,
6438
"source": "registry",
6539
"dependencies": {
@@ -69,36 +43,6 @@
6943
},
7044
"url": "https://packages.unity.com"
7145
},
72-
"com.unity.textmeshpro": {
73-
"version": "3.0.6",
74-
"depth": 0,
75-
"source": "registry",
76-
"dependencies": {
77-
"com.unity.ugui": "1.0.0"
78-
},
79-
"url": "https://packages.unity.com"
80-
},
81-
"com.unity.timeline": {
82-
"version": "1.4.8",
83-
"depth": 0,
84-
"source": "registry",
85-
"dependencies": {
86-
"com.unity.modules.director": "1.0.0",
87-
"com.unity.modules.animation": "1.0.0",
88-
"com.unity.modules.audio": "1.0.0",
89-
"com.unity.modules.particlesystem": "1.0.0"
90-
},
91-
"url": "https://packages.unity.com"
92-
},
93-
"com.unity.ugui": {
94-
"version": "1.0.0",
95-
"depth": 0,
96-
"source": "builtin",
97-
"dependencies": {
98-
"com.unity.modules.ui": "1.0.0",
99-
"com.unity.modules.imgui": "1.0.0"
100-
}
101-
},
10246
"com.unity.modules.ai": {
10347
"version": "1.0.0",
10448
"depth": 0,

‎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.29f1
2+
m_EditorVersionWithRevision: 2021.3.29f1 (204d6dc9ae1c)

‎ProjectSettings/boot.config‎

Whitespace-only changes.

0 commit comments

Comments
 (0)