Skip to content

Commit 9edd855

Browse files
committed
* Migrated to Untiy 2021.3.1f1
1 parent 8213848 commit 9edd855

10 files changed

+561
-66
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,5 @@ crashlytics-build.properties
6060

6161
/Assets/AssetStoreTools
6262
/Assets/AssetStoreTools.meta
63+
/*.vsconfig
64+
/UserSettings

Assets/DevLocker/RenderUtils/Editor/SkinnedBonesGizmos.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public BoneSegment(Transform bone1, Transform bone2)
4343

4444
static SkinnedBonesGizmos()
4545
{
46-
SceneView.onSceneGUIDelegate += OnSceneGUI;
46+
SceneView.duringSceneGui += OnSceneGUI;
4747
Selection.selectionChanged += OnSelectionChanged;
4848
}
4949

Packages/manifest.json

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,29 @@
11
{
22
"dependencies": {
3-
"com.unity.package-manager-ui": "2.0.13",
3+
"com.unity.2d.sprite": "1.0.0",
4+
"com.unity.2d.tilemap": "1.0.0",
5+
"com.unity.ide.rider": "3.0.13",
6+
"com.unity.ide.visualstudio": "2.0.14",
7+
"com.unity.ide.vscode": "1.2.5",
8+
"com.unity.test-framework": "1.1.31",
9+
"com.unity.timeline": "1.6.4",
10+
"com.unity.ugui": "1.0.0",
11+
"com.unity.xr.legacyinputhelpers": "2.1.9",
12+
"com.unity.modules.androidjni": "1.0.0",
413
"com.unity.modules.animation": "1.0.0",
514
"com.unity.modules.audio": "1.0.0",
15+
"com.unity.modules.director": "1.0.0",
616
"com.unity.modules.imageconversion": "1.0.0",
717
"com.unity.modules.imgui": "1.0.0",
818
"com.unity.modules.jsonserialize": "1.0.0",
919
"com.unity.modules.particlesystem": "1.0.0",
1020
"com.unity.modules.physics": "1.0.0",
1121
"com.unity.modules.physics2d": "1.0.0",
1222
"com.unity.modules.ui": "1.0.0",
13-
"com.unity.modules.uielements": "1.0.0"
23+
"com.unity.modules.uielements": "1.0.0",
24+
"com.unity.modules.unitywebrequest": "1.0.0",
25+
"com.unity.modules.video": "1.0.0",
26+
"com.unity.modules.vr": "1.0.0",
27+
"com.unity.modules.xr": "1.0.0"
1428
}
1529
}

Packages/packages-lock.json

+224
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
1+
{
2+
"dependencies": {
3+
"com.unity.2d.sprite": {
4+
"version": "1.0.0",
5+
"depth": 0,
6+
"source": "builtin",
7+
"dependencies": {}
8+
},
9+
"com.unity.2d.tilemap": {
10+
"version": "1.0.0",
11+
"depth": 0,
12+
"source": "builtin",
13+
"dependencies": {}
14+
},
15+
"com.unity.ext.nunit": {
16+
"version": "1.0.6",
17+
"depth": 1,
18+
"source": "registry",
19+
"dependencies": {},
20+
"url": "https://packages.unity.com"
21+
},
22+
"com.unity.ide.rider": {
23+
"version": "3.0.13",
24+
"depth": 0,
25+
"source": "registry",
26+
"dependencies": {
27+
"com.unity.ext.nunit": "1.0.6"
28+
},
29+
"url": "https://packages.unity.com"
30+
},
31+
"com.unity.ide.visualstudio": {
32+
"version": "2.0.14",
33+
"depth": 0,
34+
"source": "registry",
35+
"dependencies": {
36+
"com.unity.test-framework": "1.1.9"
37+
},
38+
"url": "https://packages.unity.com"
39+
},
40+
"com.unity.ide.vscode": {
41+
"version": "1.2.5",
42+
"depth": 0,
43+
"source": "registry",
44+
"dependencies": {},
45+
"url": "https://packages.unity.com"
46+
},
47+
"com.unity.test-framework": {
48+
"version": "1.1.31",
49+
"depth": 0,
50+
"source": "registry",
51+
"dependencies": {
52+
"com.unity.ext.nunit": "1.0.6",
53+
"com.unity.modules.imgui": "1.0.0",
54+
"com.unity.modules.jsonserialize": "1.0.0"
55+
},
56+
"url": "https://packages.unity.com"
57+
},
58+
"com.unity.timeline": {
59+
"version": "1.6.4",
60+
"depth": 0,
61+
"source": "registry",
62+
"dependencies": {
63+
"com.unity.modules.director": "1.0.0",
64+
"com.unity.modules.animation": "1.0.0",
65+
"com.unity.modules.audio": "1.0.0",
66+
"com.unity.modules.particlesystem": "1.0.0"
67+
},
68+
"url": "https://packages.unity.com"
69+
},
70+
"com.unity.ugui": {
71+
"version": "1.0.0",
72+
"depth": 0,
73+
"source": "builtin",
74+
"dependencies": {
75+
"com.unity.modules.ui": "1.0.0",
76+
"com.unity.modules.imgui": "1.0.0"
77+
}
78+
},
79+
"com.unity.xr.legacyinputhelpers": {
80+
"version": "2.1.9",
81+
"depth": 0,
82+
"source": "registry",
83+
"dependencies": {
84+
"com.unity.modules.vr": "1.0.0",
85+
"com.unity.modules.xr": "1.0.0"
86+
},
87+
"url": "https://packages.unity.com"
88+
},
89+
"com.unity.modules.androidjni": {
90+
"version": "1.0.0",
91+
"depth": 0,
92+
"source": "builtin",
93+
"dependencies": {}
94+
},
95+
"com.unity.modules.animation": {
96+
"version": "1.0.0",
97+
"depth": 0,
98+
"source": "builtin",
99+
"dependencies": {}
100+
},
101+
"com.unity.modules.audio": {
102+
"version": "1.0.0",
103+
"depth": 0,
104+
"source": "builtin",
105+
"dependencies": {}
106+
},
107+
"com.unity.modules.director": {
108+
"version": "1.0.0",
109+
"depth": 0,
110+
"source": "builtin",
111+
"dependencies": {
112+
"com.unity.modules.audio": "1.0.0",
113+
"com.unity.modules.animation": "1.0.0"
114+
}
115+
},
116+
"com.unity.modules.imageconversion": {
117+
"version": "1.0.0",
118+
"depth": 0,
119+
"source": "builtin",
120+
"dependencies": {}
121+
},
122+
"com.unity.modules.imgui": {
123+
"version": "1.0.0",
124+
"depth": 0,
125+
"source": "builtin",
126+
"dependencies": {}
127+
},
128+
"com.unity.modules.jsonserialize": {
129+
"version": "1.0.0",
130+
"depth": 0,
131+
"source": "builtin",
132+
"dependencies": {}
133+
},
134+
"com.unity.modules.particlesystem": {
135+
"version": "1.0.0",
136+
"depth": 0,
137+
"source": "builtin",
138+
"dependencies": {}
139+
},
140+
"com.unity.modules.physics": {
141+
"version": "1.0.0",
142+
"depth": 0,
143+
"source": "builtin",
144+
"dependencies": {}
145+
},
146+
"com.unity.modules.physics2d": {
147+
"version": "1.0.0",
148+
"depth": 0,
149+
"source": "builtin",
150+
"dependencies": {}
151+
},
152+
"com.unity.modules.subsystems": {
153+
"version": "1.0.0",
154+
"depth": 1,
155+
"source": "builtin",
156+
"dependencies": {
157+
"com.unity.modules.jsonserialize": "1.0.0"
158+
}
159+
},
160+
"com.unity.modules.ui": {
161+
"version": "1.0.0",
162+
"depth": 0,
163+
"source": "builtin",
164+
"dependencies": {}
165+
},
166+
"com.unity.modules.uielements": {
167+
"version": "1.0.0",
168+
"depth": 0,
169+
"source": "builtin",
170+
"dependencies": {
171+
"com.unity.modules.ui": "1.0.0",
172+
"com.unity.modules.imgui": "1.0.0",
173+
"com.unity.modules.jsonserialize": "1.0.0",
174+
"com.unity.modules.uielementsnative": "1.0.0"
175+
}
176+
},
177+
"com.unity.modules.uielementsnative": {
178+
"version": "1.0.0",
179+
"depth": 1,
180+
"source": "builtin",
181+
"dependencies": {
182+
"com.unity.modules.ui": "1.0.0",
183+
"com.unity.modules.imgui": "1.0.0",
184+
"com.unity.modules.jsonserialize": "1.0.0"
185+
}
186+
},
187+
"com.unity.modules.unitywebrequest": {
188+
"version": "1.0.0",
189+
"depth": 0,
190+
"source": "builtin",
191+
"dependencies": {}
192+
},
193+
"com.unity.modules.video": {
194+
"version": "1.0.0",
195+
"depth": 0,
196+
"source": "builtin",
197+
"dependencies": {
198+
"com.unity.modules.audio": "1.0.0",
199+
"com.unity.modules.ui": "1.0.0",
200+
"com.unity.modules.unitywebrequest": "1.0.0"
201+
}
202+
},
203+
"com.unity.modules.vr": {
204+
"version": "1.0.0",
205+
"depth": 0,
206+
"source": "builtin",
207+
"dependencies": {
208+
"com.unity.modules.jsonserialize": "1.0.0",
209+
"com.unity.modules.physics": "1.0.0",
210+
"com.unity.modules.xr": "1.0.0"
211+
}
212+
},
213+
"com.unity.modules.xr": {
214+
"version": "1.0.0",
215+
"depth": 0,
216+
"source": "builtin",
217+
"dependencies": {
218+
"com.unity.modules.physics": "1.0.0",
219+
"com.unity.modules.jsonserialize": "1.0.0",
220+
"com.unity.modules.subsystems": "1.0.0"
221+
}
222+
}
223+
}
224+
}

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: {}
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!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 61
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
m_EnablePreReleasePackages: 0
16+
m_EnablePackageDependencies: 0
17+
m_AdvancedSettingsExpanded: 1
18+
m_ScopedRegistriesSettingsExpanded: 1
19+
m_SeeAllPackageVersions: 0
20+
oneTimeWarningShown: 0
21+
m_Registries:
22+
- m_Id: main
23+
m_Name:
24+
m_Url: https://packages.unity.com
25+
m_Scopes: []
26+
m_IsDefault: 1
27+
m_Capabilities: 7
28+
m_UserSelectedRegistryName:
29+
m_UserAddingNewScopedRegistry: 0
30+
m_RegistryInfoDraft:
31+
m_Modified: 0
32+
m_ErrorMessage:
33+
m_UserModificationsInstanceId: -838
34+
m_OriginalInstanceId: -840
35+
m_LoadAssets: 0

0 commit comments

Comments
 (0)