Skip to content

Commit 75a46c9

Browse files
committed
Upgraded to Unity 2021 LTS and updated packages
1 parent 75dc1e4 commit 75a46c9

File tree

9 files changed

+746
-29
lines changed

9 files changed

+746
-29
lines changed

Assets/Patterns/7. Double Buffer/Cave/Cave mat.mat

+1
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,4 @@ Material:
7575
m_Colors:
7676
- _Color: {r: 1, g: 1, b: 1, a: 1}
7777
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
78+
m_BuildTextureStacks: []

Packages/manifest.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
5-
"com.unity.ide.rider": "2.0.7",
6-
"com.unity.ide.visualstudio": "2.0.14",
7-
"com.unity.ide.vscode": "1.2.4",
8-
"com.unity.test-framework": "1.1.29",
5+
"com.unity.ide.rider": "3.0.16",
6+
"com.unity.ide.visualstudio": "2.0.16",
7+
"com.unity.ide.vscode": "1.2.5",
8+
"com.unity.test-framework": "1.1.33",
99
"com.unity.textmeshpro": "3.0.6",
10-
"com.unity.timeline": "1.4.8",
10+
"com.unity.timeline": "1.6.4",
1111
"com.unity.ugui": "1.0.0",
1212
"com.unity.modules.ai": "1.0.0",
1313
"com.unity.modules.androidjni": "1.0.0",

Packages/packages-lock.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
"url": "https://packages.unity.com"
2121
},
2222
"com.unity.ide.rider": {
23-
"version": "2.0.7",
23+
"version": "3.0.16",
2424
"depth": 0,
2525
"source": "registry",
2626
"dependencies": {
27-
"com.unity.test-framework": "1.1.1"
27+
"com.unity.ext.nunit": "1.0.6"
2828
},
2929
"url": "https://packages.unity.com"
3030
},
3131
"com.unity.ide.visualstudio": {
32-
"version": "2.0.14",
32+
"version": "2.0.16",
3333
"depth": 0,
3434
"source": "registry",
3535
"dependencies": {
@@ -38,14 +38,14 @@
3838
"url": "https://packages.unity.com"
3939
},
4040
"com.unity.ide.vscode": {
41-
"version": "1.2.4",
41+
"version": "1.2.5",
4242
"depth": 0,
4343
"source": "registry",
4444
"dependencies": {},
4545
"url": "https://packages.unity.com"
4646
},
4747
"com.unity.test-framework": {
48-
"version": "1.1.29",
48+
"version": "1.1.33",
4949
"depth": 0,
5050
"source": "registry",
5151
"dependencies": {
@@ -65,7 +65,7 @@
6565
"url": "https://packages.unity.com"
6666
},
6767
"com.unity.timeline": {
68-
"version": "1.4.8",
68+
"version": "1.6.4",
6969
"depth": 0,
7070
"source": "registry",
7171
"dependencies": {

ProjectSettings/MemorySettings.asset

+35
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.25f1
2-
m_EditorVersionWithRevision: 2020.3.25f1 (9b9180224418)
1+
m_EditorVersion: 2021.3.9f1
2+
m_EditorVersionWithRevision: 2021.3.9f1 (ad3870b89536)

ProjectSettings/boot.config

Whitespace-only changes.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ Define a template method in the parent class which consists of calling several m
555555

556556

557557

558-
# Credits
558+
# Special thanks
559559

560560
* [masoudarvishian](https://github.com/masoudarvishian) for implementing Event Queue pattern, Service Locator pattern, and bug fixing
561561
* [VladimirMirMir](https://github.com/VladimirMirMir) for bug fixing

UserSettings/EditorUserSettings.asset

+7-15
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,8 @@ EditorUserSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 4
77
m_ConfigSettings:
8-
RecentlyUsedScenePath-0:
9-
value: 224247031146466b0c1a1827022d4c5f435958192526213c283d123dadf33d36e5eb33fde8347129370bfb25
10-
flags: 0
11-
RecentlyUsedScenePath-1:
12-
value: 224247031146466b0c1a1827022d4c5f4159580e233d243c28693f26e4e6312aadc437ffe2753b332c00e339443c1439f40f1b4bf50a1c0e5f1bf30705e6
13-
flags: 0
14-
RecentlyUsedScenePath-2:
15-
value: 224247031146466b0c1a1827022d4c5f40595819382932356204183df7af272ce3f333a4ea3f31297717e1351027
16-
flags: 0
17-
RecentlyUsedScenePath-3:
18-
value: 224247031146466b0c1a1827022d4c5f4743566a0f272b3d2c271973d3f5312de7a77eccf13f31287933fa39113b4870d1050406f7050e3a040be80b22fc151d148b0dcb13dc06
19-
flags: 0
20-
RecentlyUsedScenePath-4:
21-
value: 224247031146466b0c1a1827022d4c5f4742566a1f2d3426242a1873ceef3739f6e824a9af1b31332d0aea2e44170c2ffe0f040ef81f0b1f1801f3475ecc150107cc1bc036c71c1ddf160efdce18dfe69bc3dae3ccf2
8+
RecentlyUsedSceneGuid-0:
9+
value: 560001075d54085d5b5c597746770a4410151c727d782060792a4e67e1b9323b
2210
flags: 0
2311
vcSharedLogLevel:
2412
value: 0d5e400f0650
@@ -28,9 +16,13 @@ EditorUserSettings:
2816
m_VCDebugCmd: 0
2917
m_VCDebugOut: 0
3018
m_SemanticMergeMode: 2
19+
m_DesiredImportWorkerCount: 1
20+
m_StandbyImportWorkerCount: 1
21+
m_IdleImportWorkerShutdownDelay: 60000
3122
m_VCShowFailedCheckout: 1
3223
m_VCOverwriteFailedCheckoutAssets: 1
3324
m_VCProjectOverlayIcons: 1
3425
m_VCHierarchyOverlayIcons: 1
3526
m_VCOtherOverlayIcons: 1
36-
m_VCAllowAsyncUpdate: 0
27+
m_VCAllowAsyncUpdate: 1
28+
m_ArtifactGarbageCollection: 1

0 commit comments

Comments
 (0)