Skip to content

Commit f05018a

Browse files
hookSSihookSSi
authored
Merge branch 'Cammin:master' into fix/sync-issue-with-config-file
2 parents 3e88303 + 7747bf2 commit f05018a

20 files changed

Lines changed: 660 additions & 42 deletions

‎.github/workflows/test-runner.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,19 @@ jobs:
3131
with:
3232
lfs: true
3333

34+
#Use a custom packages list instead of the original manifest
35+
- name: Use CI Manifest
36+
run: cp Packages/manifest_ci.json Packages/manifest.json
37+
3438
#Test Cache
3539
- uses: actions/cache@v4.2.3
3640
with:
3741
path: Library
38-
key: Library-${{ matrix.unityVersion }}
39-
restore-keys:
40-
Library-${{ matrix.unityVersion }}
41-
42+
# This ensures a clean Library if manifest_ci.json is changed
43+
key: Library-${{ matrix.unityVersion }}-${{ hashFiles('Packages/manifest.json') }}
44+
restore-keys: |
45+
Library-${{ matrix.unityVersion }}-
46+
4247
#Test Runner
4348
- uses: game-ci/unity-test-runner@v4.3.1
4449
id: tests

‎.github/workflows/test-runner_dispatch.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,19 @@ jobs:
3737
with:
3838
lfs: true
3939

40+
#Use a custom packages list instead of the original manifest
41+
- name: Use CI Manifest
42+
run: cp Packages/manifest_ci.json Packages/manifest.json
43+
4044
#Test Cache
4145
- uses: actions/cache@v4.2.3
4246
with:
4347
path: Library
44-
key: Library-${{ matrix.unityVersion }}
45-
restore-keys:
46-
Library-${{ matrix.unityVersion }}
48+
# This ensures a clean Library if manifest_ci.json is changed
49+
key: Library-${{ matrix.unityVersion }}-${{ hashFiles('Packages/manifest.json') }}
50+
restore-keys: |
51+
Library-${{ matrix.unityVersion }}-
52+
4753

4854
#Test Runner
4955
- uses: game-ci/unity-test-runner@v4.1.1

‎.github/workflows/unity-builder.yml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
pull_request:
66
workflow_dispatch:
7-
7+
88
jobs:
99
build:
1010
name: Build-${{ matrix.targetPlatform }}-${{ matrix.unityVersion }}
@@ -24,7 +24,6 @@ jobs:
2424
- 2022.3.43f1
2525
- 6000.0.64f1
2626
- 6000.3.2f1
27-
2827
include:
2928
- targetPlatform: WebGL
3029
unityVersion: 2019.3.15f1
@@ -38,15 +37,23 @@ jobs:
3837
with:
3938
fetch-depth: 0
4039
lfs: true
41-
40+
41+
#Use a custom packages list instead of the original manifest
42+
- name: Use CI Manifest
43+
run: |
44+
cp Packages/manifest_ci.json Packages/manifest.json
45+
git update-index --assume-unchanged Packages/manifest.json
46+
4247
#Build Cache
4348
- uses: actions/cache@v4.2.3
4449
with:
4550
path: Library
46-
key: Library-${{ matrix.unityVersion }}
47-
restore-keys:
48-
Library-${{ matrix.unityVersion }}
49-
51+
# This ensures a clean Library if manifest_ci.json is changed
52+
key: Library-${{ matrix.unityVersion }}-${{ hashFiles('Packages/manifest.json') }}
53+
restore-keys: |
54+
Library-${{ matrix.unityVersion }}-
55+
56+
5057
#Build
5158
- uses: game-ci/unity-builder@v4.3.0
5259
env:

‎Assets/LDtkUnity/CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
## [6.12.3](https://github.com/Cammin/LDtkToUnity/compare/6.12.2...6.12.3) (2026-04-10)
2+
3+
4+
### Bug Fixes
5+
6+
* Tweaked the Iid FindObjectsByType so Unity 6.4+ won't throw a warning ([42d896c](https://github.com/Cammin/LDtkToUnity/commit/42d896cf7cd94acd55c037fe2727f076e21ca843))
7+
8+
9+
### Performance Improvements
10+
11+
* Set all importers to AllowCaching so that it may potentially work with parallel importing better ([9d44ddc](https://github.com/Cammin/LDtkToUnity/commit/9d44ddc4e8df8180baf6f62d8aeabc56f9ba6411))
12+
13+
## [6.12.2](https://github.com/Cammin/LDtkToUnity/compare/6.12.1...6.12.2) (2026-03-23)
14+
15+
16+
### Bug Fixes
17+
18+
* Fixed issue where a level component's iid component reference was assigned a previous layer ([bf953f1](https://github.com/Cammin/LDtkToUnity/commit/bf953f13ad92e7da454aead249ab605a1e2b290f))
19+
120
## [6.12.1](https://github.com/Cammin/LDtkToUnity/compare/6.12.0...6.12.1) (2026-01-25)
221

322

‎Assets/LDtkUnity/Editor/Builders/LDtkBuilderLevel.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ internal sealed class LDtkBuilderLevel
2222
private LDtkComponentLayer[] _layerComponents;
2323
private MonoBehaviour[] _components;
2424

25+
private LDtkIid _layerIidComponent;
2526
private GameObject _layerGameObject;
2627
private LDtkComponentLayer _layerComponent;
2728
private LDtkComponentLayerParallax _parallax;
@@ -169,8 +170,8 @@ private void BuildFields()
169170

170171
private void AddIidComponent()
171172
{
172-
LDtkIid iid = _levelGameObject.AddComponent<LDtkIid>();
173-
iid.SetIid(_level);
173+
_iidComponent = _levelGameObject.AddComponent<LDtkIid>();
174+
_iidComponent.SetIid(_level);
174175
}
175176

176177
private GameObject CreateLevelGameObject()
@@ -291,8 +292,8 @@ void TryBuildLayerGameObject()
291292
_parallax = _layerGameObject.AddComponent<LDtkComponentLayerParallax>();
292293
}
293294

294-
_iidComponent = _layerGameObject.AddComponent<LDtkIid>();
295-
_iidComponent.SetIid(layer);
295+
_layerIidComponent = _layerGameObject.AddComponent<LDtkIid>();
296+
_layerIidComponent.SetIid(layer);
296297

297298
builtLayer = true;
298299
}
@@ -342,7 +343,7 @@ void TryPopulateLayerComponent(ref bool populated)
342343
}
343344

344345
//now that everything is gathered, do the special OnImport and populate that component
345-
_layerComponent.OnImport(_importer.DefinitionObjects, layer, _levelComponent, _iidComponent, entities, _layerIntGrid, _layerTiles, layerScale);
346+
_layerComponent.OnImport(_importer.DefinitionObjects, layer, _levelComponent, _layerIidComponent, entities, _layerIntGrid, _layerTiles, layerScale);
346347
if (_project.UseParallax)
347348
{
348349
Vector2 halfLvlSize = (Vector2)_level.UnityPxSize / _project.PixelsPerUnit * 0.5f;

‎Assets/LDtkUnity/Editor/ScriptedImporter/LDtkConfigImporter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace LDtkUnity.Editor
1010
{
11-
[ScriptedImporter(LDtkImporterConsts.CONFIG_VERSION, LDtkImporterConsts.CONFIG_EXT, LDtkImporterConsts.CONFIG_ORDER)]
11+
[ScriptedImporter(LDtkImporterConsts.CONFIG_VERSION, LDtkImporterConsts.CONFIG_EXT, LDtkImporterConsts.CONFIG_ORDER, AllowCaching = true)]
1212
internal sealed class LDtkConfigImporter : ScriptedImporter
1313
{
1414
public override void OnImportAsset(AssetImportContext ctx)

‎Assets/LDtkUnity/Editor/ScriptedImporter/LDtkImporterConsts.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
{
33
internal static class LDtkImporterConsts
44
{
5-
public const int PROJECT_VERSION = 35;
6-
public const int LEVEL_VERSION = 19;
5+
public const int PROJECT_VERSION = 36;
6+
public const int LEVEL_VERSION = 20;
77
public const int TILESET_VERSION = 8;
88
public const int CONFIG_VERSION = 0;
99

‎Assets/LDtkUnity/Editor/ScriptedImporter/LDtkLevelImporter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace LDtkUnity.Editor
1414
{
1515
[HelpURL(LDtkHelpURL.IMPORTER_LDTK_LEVEL)]
16-
[ScriptedImporter(LDtkImporterConsts.LEVEL_VERSION, LDtkImporterConsts.LEVEL_EXT, LDtkImporterConsts.LEVEL_ORDER)]
16+
[ScriptedImporter(LDtkImporterConsts.LEVEL_VERSION, LDtkImporterConsts.LEVEL_EXT, LDtkImporterConsts.LEVEL_ORDER, AllowCaching = true)]
1717
internal sealed class LDtkLevelImporter : LDtkJsonImporter<LDtkLevelFile>
1818
{
1919
//statically reset this upon the editor application delay call so that we only need to deserialize json data once

‎Assets/LDtkUnity/Editor/ScriptedImporter/LDtkProjectImporter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
namespace LDtkUnity.Editor
1818
{
1919
[HelpURL(LDtkHelpURL.IMPORTER_LDTK_PROJECT)]
20-
[ScriptedImporter(LDtkImporterConsts.PROJECT_VERSION, LDtkImporterConsts.PROJECT_EXT, LDtkImporterConsts.PROJECT_ORDER)]
20+
[ScriptedImporter(LDtkImporterConsts.PROJECT_VERSION, LDtkImporterConsts.PROJECT_EXT, LDtkImporterConsts.PROJECT_ORDER, AllowCaching = true)]
2121
internal sealed class LDtkProjectImporter : LDtkJsonImporter<LDtkProjectFile>
2222
{
2323
public const string JSON = nameof(_jsonFile);

‎Assets/LDtkUnity/Editor/ScriptedImporter/LDtkTilesetImporter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace LDtkUnity.Editor
2525
/// This has no dependency back to the project importer, only the texture it references.
2626
/// </summary>
2727
[HelpURL(LDtkHelpURL.IMPORTER_LDTK_TILESET)]
28-
[ScriptedImporter(LDtkImporterConsts.TILESET_VERSION, LDtkImporterConsts.TILESET_EXT, LDtkImporterConsts.TILESET_ORDER)]
28+
[ScriptedImporter(LDtkImporterConsts.TILESET_VERSION, LDtkImporterConsts.TILESET_EXT, LDtkImporterConsts.TILESET_ORDER, AllowCaching = true)]
2929
internal sealed partial class LDtkTilesetImporter : LDtkJsonImporter<LDtkTilesetFile>
3030
{
3131
public const string PIXELS_PER_UNIT = nameof(_pixelsPerUnit);

0 commit comments

Comments
 (0)