Skip to content

Commit bede8be

Browse files
committed
fix: Disabled a .ldtkc import attempt that Unity does not encourage. Also prevents it's related warning which appears in 6000.3
1 parent afe3ae7 commit bede8be

File tree

4 files changed

+29
-7
lines changed

4 files changed

+29
-7
lines changed

Assets/LDtkUnity/Editor/ScriptedImporter/LDtkProjectImporter.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ private void TryCreateTableOfContents(LdtkJson json)
260260
ImportContext.AddObjectToAsset("toc", Toc, LDtkIconUtility.LoadListIcon());
261261
}
262262

263+
//todo: this should be generated as part of the dependency gather so that there is less import order issues
263264
private void GenerateConfigurationFile(LdtkJson json)
264265
{
265266
//only generate the file if separate levels is used
@@ -280,10 +281,11 @@ private void GenerateConfigurationFile(LdtkJson json)
280281
Entities = _entities,
281282
ScaleEntities = _scaleEntities,
282283
};
283-
string writePath = config.WriteJson(assetPath);
284+
config.WriteJson(assetPath);
284285

285286
//importing the asset if it doesn't exist due to the asset database not refreshing this automatically
286-
AssetDatabase.ImportAsset(writePath);
287+
//NOTE: This is not allowed during the import of another asset because of determinism
288+
//AssetDatabase.ImportAsset(writePath);
287289
}
288290

289291
private void BufferEditorCache()

Packages/manifest.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"com.unity.ide.rider": "3.0.38",
88
"com.unity.ide.visualstudio": "2.0.25",
99
"com.unity.test-framework": "1.6.0",
10-
"com.unity.testtools.codecoverage": "1.2.6",
10+
"com.unity.testtools.codecoverage": "1.2.7",
11+
"com.unity.modules.adaptiveperformance": "1.0.0",
1112
"com.unity.modules.ai": "1.0.0",
1213
"com.unity.modules.androidjni": "1.0.0",
1314
"com.unity.modules.animation": "1.0.0",
@@ -34,6 +35,7 @@
3435
"com.unity.modules.unitywebrequestaudio": "1.0.0",
3536
"com.unity.modules.unitywebrequesttexture": "1.0.0",
3637
"com.unity.modules.unitywebrequestwww": "1.0.0",
38+
"com.unity.modules.vectorgraphics": "1.0.0",
3739
"com.unity.modules.vehicles": "1.0.0",
3840
"com.unity.modules.video": "1.0.0",
3941
"com.unity.modules.vr": "1.0.0",

Packages/packages-lock.json

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"url": "https://packages.unity.com"
5555
},
5656
"com.unity.settings-manager": {
57-
"version": "2.1.0",
57+
"version": "2.1.1",
5858
"depth": 1,
5959
"source": "registry",
6060
"dependencies": {},
@@ -71,7 +71,7 @@
7171
}
7272
},
7373
"com.unity.testtools.codecoverage": {
74-
"version": "1.2.6",
74+
"version": "1.2.7",
7575
"depth": 0,
7676
"source": "registry",
7777
"dependencies": {
@@ -80,6 +80,14 @@
8080
},
8181
"url": "https://packages.unity.com"
8282
},
83+
"com.unity.modules.adaptiveperformance": {
84+
"version": "1.0.0",
85+
"depth": 0,
86+
"source": "builtin",
87+
"dependencies": {
88+
"com.unity.modules.subsystems": "1.0.0"
89+
}
90+
},
8391
"com.unity.modules.ai": {
8492
"version": "1.0.0",
8593
"depth": 0,
@@ -287,6 +295,16 @@
287295
"com.unity.modules.imageconversion": "1.0.0"
288296
}
289297
},
298+
"com.unity.modules.vectorgraphics": {
299+
"version": "1.0.0",
300+
"depth": 0,
301+
"source": "builtin",
302+
"dependencies": {
303+
"com.unity.modules.uielements": "1.0.0",
304+
"com.unity.modules.imageconversion": "1.0.0",
305+
"com.unity.modules.imgui": "1.0.0"
306+
}
307+
},
290308
"com.unity.modules.vehicles": {
291309
"version": "1.0.0",
292310
"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: 6000.2.13f1
2-
m_EditorVersionWithRevision: 6000.2.13f1 (abdb44fca7f7)
1+
m_EditorVersion: 6000.3.0f1
2+
m_EditorVersionWithRevision: 6000.3.0f1 (d1870ce95baf)

0 commit comments

Comments
 (0)