Skip to content

Commit 589fc69

Browse files
committed
Upgraded to Unity 2021 and configured addressables to not rely on CCD
1 parent 4edf99d commit 589fc69

File tree

9 files changed

+1161
-36
lines changed

9 files changed

+1161
-36
lines changed

Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,42 @@ MonoBehaviour:
2121
m_Address: MainMenu
2222
m_ReadOnly: 0
2323
m_SerializedLabels: []
24-
m_MainAsset: {fileID: 0}
25-
m_TargetAsset: {fileID: 0}
2624
- m_GUID: a1e01d398699cc940a960600837600bd
2725
m_Address: LoadingScene
2826
m_ReadOnly: 0
2927
m_SerializedLabels: []
30-
m_MainAsset: {fileID: 0}
31-
m_TargetAsset: {fileID: 0}
28+
- m_GUID: 7554b18db3b335b4da1ca6ff65374ac9
29+
m_Address: Level_00
30+
m_ReadOnly: 0
31+
m_SerializedLabels: []
32+
- m_GUID: 952b5b04d0205ba4084c9256369178ae
33+
m_Address: Level_01
34+
m_ReadOnly: 0
35+
m_SerializedLabels: []
36+
- m_GUID: e40f8e5164d7a3b49a53720406e42408
37+
m_Address: Level_02
38+
m_ReadOnly: 0
39+
m_SerializedLabels: []
40+
- m_GUID: 29c1d8c3070b4e441ab2c21e14128a7b
41+
m_Address: Level_03
42+
m_ReadOnly: 0
43+
m_SerializedLabels: []
44+
- m_GUID: b53baa10142cbb346a47ab071d32889a
45+
m_Address: Hat00
46+
m_ReadOnly: 0
47+
m_SerializedLabels: []
48+
- m_GUID: 6e65281e8a345ff4ea1b73f2a1578a6d
49+
m_Address: Hat01
50+
m_ReadOnly: 0
51+
m_SerializedLabels: []
52+
- m_GUID: 6c93cb6413eaf5f46bbe190dbbad2651
53+
m_Address: Hat02
54+
m_ReadOnly: 0
55+
m_SerializedLabels: []
56+
- m_GUID: 434c1413ad6a76842a3a98e6a21aefa5
57+
m_Address: Hat03
58+
m_ReadOnly: 0
59+
m_SerializedLabels: []
3260
m_ReadOnly: 0
3361
m_Settings: {fileID: 11400000, guid: 661d48ea9271a404cae43a9e2517e23a, type: 2}
3462
m_SchemaSet:

Packages/manifest.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.addressables": "1.16.19",
5-
"com.unity.ide.rider": "3.0.7",
6-
"com.unity.ide.visualstudio": "2.0.9",
7-
"com.unity.postprocessing": "3.1.1",
8-
"com.unity.scriptablebuildpipeline": "1.16.1",
9-
"com.unity.test-framework": "1.1.26",
4+
"com.unity.addressables": "1.19.19",
5+
"com.unity.ide.rider": "3.0.13",
6+
"com.unity.ide.visualstudio": "2.0.14",
7+
"com.unity.postprocessing": "3.2.1",
8+
"com.unity.scriptablebuildpipeline": "1.19.6",
9+
"com.unity.test-framework": "1.1.31",
1010
"com.unity.textmeshpro": "3.0.6",
1111
"com.unity.ugui": "1.0.0",
1212
"com.unity.modules.ai": "1.0.0",

Packages/packages-lock.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
"dependencies": {}
88
},
99
"com.unity.addressables": {
10-
"version": "1.16.19",
10+
"version": "1.19.19",
1111
"depth": 0,
1212
"source": "registry",
1313
"dependencies": {
14-
"com.unity.scriptablebuildpipeline": "1.15.2",
14+
"com.unity.scriptablebuildpipeline": "1.19.6",
1515
"com.unity.modules.assetbundle": "1.0.0",
16+
"com.unity.modules.imageconversion": "1.0.0",
17+
"com.unity.modules.jsonserialize": "1.0.0",
1618
"com.unity.modules.unitywebrequest": "1.0.0",
1719
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"
1820
},
@@ -26,7 +28,7 @@
2628
"url": "https://packages.unity.com"
2729
},
2830
"com.unity.ide.rider": {
29-
"version": "3.0.7",
31+
"version": "3.0.13",
3032
"depth": 0,
3133
"source": "registry",
3234
"dependencies": {
@@ -35,7 +37,7 @@
3537
"url": "https://packages.unity.com"
3638
},
3739
"com.unity.ide.visualstudio": {
38-
"version": "2.0.9",
40+
"version": "2.0.14",
3941
"depth": 0,
4042
"source": "registry",
4143
"dependencies": {
@@ -44,7 +46,7 @@
4446
"url": "https://packages.unity.com"
4547
},
4648
"com.unity.postprocessing": {
47-
"version": "3.1.1",
49+
"version": "3.2.1",
4850
"depth": 0,
4951
"source": "registry",
5052
"dependencies": {
@@ -53,14 +55,14 @@
5355
"url": "https://packages.unity.com"
5456
},
5557
"com.unity.scriptablebuildpipeline": {
56-
"version": "1.16.1",
58+
"version": "1.19.6",
5759
"depth": 0,
5860
"source": "registry",
5961
"dependencies": {},
6062
"url": "https://packages.unity.com"
6163
},
6264
"com.unity.test-framework": {
63-
"version": "1.1.26",
65+
"version": "1.1.31",
6466
"depth": 0,
6567
"source": "registry",
6668
"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: {}

0 commit comments

Comments
 (0)