Skip to content

Commit ecb582b

Browse files
IvanMurzakIvanMurzak
committed
Updated editor version to 6000.0.34f1
1 parent fab46dd commit ecb582b

File tree

10 files changed

+196
-83
lines changed

10 files changed

+196
-83
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,8 @@ crashlytics-build.properties
7373

7474
# ODIN plugin
7575
/Assets/Plugins/Sirenix**
76+
77+
# Other
78+
UserSettings/Layouts/default-2021.dwlt
79+
UserSettings/Layouts/default-2022.dwlt
80+
UserSettings/Layouts/default-6000.dwlt

‎.vscode/extensions.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"recommendations": [
3+
"visualstudiotoolsforunity.vstuc"
4+
]
5+
}

‎.vscode/launch.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "Attach to Unity",
6+
"type": "vstuc",
7+
"request": "attach"
8+
}
9+
]
10+
}

‎.vscode/settings.json‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
11
{
2-
"files.exclude":
3-
{
4-
"**/.DS_Store":true,
5-
"**/.git":true,
6-
"**/.gitmodules":true,
7-
"**/*.booproj":true,
8-
"**/*.pidb":true,
9-
"**/*.suo":true,
10-
"**/*.user":true,
11-
"**/*.userprefs":true,
12-
"**/*.unityproj":true,
13-
"**/*.dll":true,
14-
"**/*.exe":true,
15-
"**/*.pdf":true,
16-
"**/*.mid":true,
17-
"**/*.midi":true,
18-
"**/*.wav":true,
19-
"**/*.gif":true,
20-
"**/*.ico":true,
21-
"**/*.jpg":true,
22-
"**/*.jpeg":true,
23-
"**/*.png":true,
24-
"**/*.psd":true,
25-
"**/*.tga":true,
26-
"**/*.tif":true,
27-
"**/*.tiff":true,
28-
"**/*.3ds":true,
29-
"**/*.3DS":true,
30-
"**/*.fbx":true,
31-
"**/*.FBX":true,
32-
"**/*.lxo":true,
33-
"**/*.LXO":true,
34-
"**/*.ma":true,
35-
"**/*.MA":true,
36-
"**/*.obj":true,
37-
"**/*.OBJ":true,
38-
"**/*.asset":true,
39-
"**/*.cubemap":true,
40-
"**/*.flare":true,
41-
"**/*.mat":true,
42-
"**/*.meta":true,
43-
"**/*.prefab":true,
44-
"**/*.unity":true,
45-
"build/":true,
46-
"Build/":true,
47-
"Library/":true,
48-
"library/":true,
49-
"obj/":true,
50-
"Obj/":true,
51-
"ProjectSettings/":true,
52-
"temp/":true,
53-
"Temp/":true
2+
"files.exclude": {
3+
"**/.DS_Store": true,
4+
"**/.git": true,
5+
"**/.gitmodules": true,
6+
"**/*.booproj": true,
7+
"**/*.pidb": true,
8+
"**/*.suo": true,
9+
"**/*.user": true,
10+
"**/*.userprefs": true,
11+
"**/*.unityproj": true,
12+
"**/*.dll": true,
13+
"**/*.exe": true,
14+
"**/*.pdf": true,
15+
"**/*.mid": true,
16+
"**/*.midi": true,
17+
"**/*.wav": true,
18+
"**/*.gif": true,
19+
"**/*.ico": true,
20+
"**/*.jpg": true,
21+
"**/*.jpeg": true,
22+
"**/*.png": true,
23+
"**/*.psd": true,
24+
"**/*.tga": true,
25+
"**/*.tif": true,
26+
"**/*.tiff": true,
27+
"**/*.3ds": true,
28+
"**/*.3DS": true,
29+
"**/*.fbx": true,
30+
"**/*.FBX": true,
31+
"**/*.lxo": true,
32+
"**/*.LXO": true,
33+
"**/*.ma": true,
34+
"**/*.MA": true,
35+
"**/*.obj": true,
36+
"**/*.OBJ": true,
37+
"**/*.asset": true,
38+
"**/*.cubemap": true,
39+
"**/*.flare": true,
40+
"**/*.mat": true,
41+
"**/*.meta": true,
42+
"**/*.prefab": true,
43+
"**/*.unity": true,
44+
"build/": true,
45+
"Build/": true,
46+
"Library/": true,
47+
"library/": true,
48+
"obj/": true,
49+
"Obj/": true,
50+
"ProjectSettings/": true,
51+
"temp/": true,
52+
"Temp/": true
5453
},
5554
"dotnet.preferCSharpExtension": true,
5655
"cSpell.words": [
5756
"ARGB"
58-
]
57+
],
58+
"dotnet.defaultSolution": "Unity-ImageLoader.sln"
5959
}

‎Packages/manifest.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
{
22
"dependencies": {
3-
"com.cysharp.unitask": "2.5.4",
4-
"com.unity.ide.rider": "3.0.28",
3+
"com.cysharp.unitask": "2.5.10",
54
"com.unity.ide.visualstudio": "2.0.22",
65
"com.unity.ide.vscode": "1.2.5",
7-
"com.unity.test-framework": "1.1.33",
8-
"com.unity.ugui": "1.0.0",
6+
"com.unity.test-framework": "1.4.6",
7+
"com.unity.ugui": "2.0.0",
98
"com.unity.modules.imageconversion": "1.0.0",
109
"com.unity.modules.imgui": "1.0.0",
1110
"com.unity.modules.jsonserialize": "1.0.0",
1211
"com.unity.modules.ui": "1.0.0",
13-
"com.unity.modules.unityanalytics": "1.0.0",
1412
"com.unity.modules.unitywebrequest": "1.0.0",
1513
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
1614
"com.unity.modules.unitywebrequestaudio": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
11
{
22
"dependencies": {
33
"com.cysharp.unitask": {
4-
"version": "2.5.4",
4+
"version": "2.5.10",
55
"depth": 0,
66
"source": "registry",
77
"dependencies": {},
88
"url": "https://package.openupm.com"
99
},
1010
"com.unity.ext.nunit": {
11-
"version": "1.0.6",
11+
"version": "2.0.5",
1212
"depth": 1,
1313
"source": "registry",
1414
"dependencies": {},
1515
"url": "https://packages.unity.com"
1616
},
17-
"com.unity.ide.rider": {
18-
"version": "3.0.28",
19-
"depth": 0,
20-
"source": "registry",
21-
"dependencies": {
22-
"com.unity.ext.nunit": "1.0.6"
23-
},
24-
"url": "https://packages.unity.com"
25-
},
2617
"com.unity.ide.visualstudio": {
2718
"version": "2.0.22",
2819
"depth": 0,
@@ -40,18 +31,18 @@
4031
"url": "https://packages.unity.com"
4132
},
4233
"com.unity.test-framework": {
43-
"version": "1.1.33",
34+
"version": "1.4.6",
4435
"depth": 0,
4536
"source": "registry",
4637
"dependencies": {
47-
"com.unity.ext.nunit": "1.0.6",
38+
"com.unity.ext.nunit": "2.0.3",
4839
"com.unity.modules.imgui": "1.0.0",
4940
"com.unity.modules.jsonserialize": "1.0.0"
5041
},
5142
"url": "https://packages.unity.com"
5243
},
5344
"com.unity.ugui": {
54-
"version": "1.0.0",
45+
"version": "2.0.0",
5546
"depth": 0,
5647
"source": "builtin",
5748
"dependencies": {
@@ -95,15 +86,6 @@
9586
"source": "builtin",
9687
"dependencies": {}
9788
},
98-
"com.unity.modules.unityanalytics": {
99-
"version": "1.0.0",
100-
"depth": 0,
101-
"source": "builtin",
102-
"dependencies": {
103-
"com.unity.modules.unitywebrequest": "1.0.0",
104-
"com.unity.modules.jsonserialize": "1.0.0"
105-
}
106-
},
10789
"com.unity.modules.unitywebrequest": {
10890
"version": "1.0.0",
10991
"depth": 0,

‎ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2022.3.25f1
2-
m_EditorVersionWithRevision: 2022.3.25f1 (530ae0ba3889)
1+
m_EditorVersion: 6000.0.34f1
2+
m_EditorVersionWithRevision: 6000.0.34f1 (5ab2d9ed9190)

‎UserSettings/EditorUserSettings.asset‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!162 &1
4+
EditorUserSettings:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 4
7+
m_ConfigSettings:
8+
vcSharedLogLevel:
9+
value: 0d5e400f0650
10+
flags: 0
11+
m_VCAutomaticAdd: 1
12+
m_VCDebugCom: 0
13+
m_VCDebugCmd: 0
14+
m_VCDebugOut: 0
15+
m_SemanticMergeMode: 2
16+
m_DesiredImportWorkerCount: 8
17+
m_StandbyImportWorkerCount: 2
18+
m_IdleImportWorkerShutdownDelay: 60000
19+
m_VCShowFailedCheckout: 1
20+
m_VCOverwriteFailedCheckoutAssets: 1
21+
m_VCProjectOverlayIcons: 1
22+
m_VCHierarchyOverlayIcons: 1
23+
m_VCOtherOverlayIcons: 1
24+
m_VCAllowAsyncUpdate: 1
25+
m_ArtifactGarbageCollection: 1

‎UserSettings/Search.index‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"name": "Assets",
3+
"roots": ["Assets"],
4+
"includes": [],
5+
"excludes": [],
6+
"options": {
7+
"types": true,
8+
"properties": true,
9+
"extended": false,
10+
"dependencies": false
11+
},
12+
"baseScore": 999
13+
}

‎UserSettings/Search.settings‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
trackSelection = true
2+
refreshSearchWindowsInPlayMode = false
3+
fetchPreview = true
4+
defaultFlags = 0
5+
keepOpen = false
6+
queryFolder = "Assets"
7+
onBoardingDoNotAskAgain = true
8+
showPackageIndexes = false
9+
showStatusBar = false
10+
scopes = {
11+
}
12+
providers = {
13+
adb = {
14+
active = false
15+
priority = 2500
16+
defaultAction = null
17+
}
18+
find = {
19+
active = true
20+
priority = 25
21+
defaultAction = null
22+
}
23+
store = {
24+
active = true
25+
priority = 100
26+
defaultAction = null
27+
}
28+
packages = {
29+
active = true
30+
priority = 90
31+
defaultAction = null
32+
}
33+
log = {
34+
active = false
35+
priority = 210
36+
defaultAction = null
37+
}
38+
asset = {
39+
active = true
40+
priority = 25
41+
defaultAction = null
42+
}
43+
profilermarkers = {
44+
active = false
45+
priority = 100
46+
defaultAction = null
47+
}
48+
performance = {
49+
active = false
50+
priority = 100
51+
defaultAction = null
52+
}
53+
scene = {
54+
active = true
55+
priority = 50
56+
defaultAction = null
57+
}
58+
}
59+
objectSelectors = {
60+
}
61+
recentSearches = [
62+
]
63+
searchItemFavorites = [
64+
]
65+
savedSearchesSortOrder = 0
66+
showSavedSearchPanel = false
67+
hideTabs = false
68+
expandedQueries = [
69+
]
70+
queryBuilder = false
71+
ignoredProperties = "id;name;classname;imagecontentshash"
72+
helperWidgetCurrentArea = "all"
73+
disabledIndexers = ""
74+
minIndexVariations = 2
75+
findProviderIndexHelper = true

0 commit comments

Comments
 (0)