Skip to content

Commit c9515e2

Browse files
authored
Merge branch 'favoyang:master' into master
2 parents d5bacef + 4586e78 commit c9515e2

File tree

5 files changed

+49
-9
lines changed

5 files changed

+49
-9
lines changed

β€Ž.all-contributorsrcβ€Ž

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,24 @@
166166
"contributions": [
167167
"code"
168168
]
169+
},
170+
{
171+
"login": "Brian-Jiang",
172+
"name": "Brian",
173+
"avatar_url": "https://avatars.githubusercontent.com/u/35553805?v=4",
174+
"profile": "https://github.com/Brian-Jiang",
175+
"contributions": [
176+
"code"
177+
]
178+
},
179+
{
180+
"login": "rlintott",
181+
"name": "Ryan",
182+
"avatar_url": "https://avatars.githubusercontent.com/u/50784910?v=4",
183+
"profile": "https://github.com/rlintott",
184+
"contributions": [
185+
"bug"
186+
]
169187
}
170188
],
171189
"contributorsPerLine": 7,
@@ -174,5 +192,6 @@
174192
"repoType": "github",
175193
"repoHost": "https://github.com",
176194
"skipCi": true,
177-
"commitConvention": "angular"
195+
"commitConvention": "angular",
196+
"commitType": "docs"
178197
}

β€ŽCHANGELOG.mdβ€Ž

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# [0.17.0](https://github.com/favoyang/unity-addressable-importer/compare/v0.16.2...v0.17.0) (2025-12-15)
2+
3+
4+
### Features
5+
6+
* update addressables version to 1.19.19 ([1e89b64](https://github.com/favoyang/unity-addressable-importer/commit/1e89b64f975d3ed93ed47b9f9b7b412897105698)), closes [#95](https://github.com/favoyang/unity-addressable-importer/issues/95)
7+
8+
## [0.16.2](https://github.com/favoyang/unity-addressable-importer/compare/v0.16.1...v0.16.2) (2025-12-15)
9+
10+
11+
### Bug Fixes
12+
13+
* use AddressableAssetEntry.SetLabel function so group settings can be serialized ([#95](https://github.com/favoyang/unity-addressable-importer/issues/95)) ([ded7fc2](https://github.com/favoyang/unity-addressable-importer/commit/ded7fc2312946cbdde594ff4e5add5e4a1e9db16))
14+
115
## [0.16.1](https://github.com/favoyang/unity-addressable-importer/compare/v0.16.0...v0.16.1) (2023-02-08)
216

317

β€ŽEditor/AddressableImporter.csβ€Ž

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,19 @@ static AddressableAssetEntry CreateOrUpdateAddressableAssetEntry(
298298

299299
// Add labels
300300
if (rule.LabelMode == LabelWriteMode.Replace)
301-
entry.labels.Clear();
301+
{
302+
var currentLabels = entry.labels.ToArray();
303+
foreach (var label in currentLabels)
304+
{
305+
entry.SetLabel(label, false);
306+
}
307+
}
302308

303309
if (rule.labelsRefsEnum != null)
304310
{
305311
foreach (var label in rule.labelsRefsEnum)
306312
{
307-
entry.labels.Add(label);
313+
entry.SetLabel(label, true);
308314
}
309315
}
310316

@@ -313,8 +319,7 @@ static AddressableAssetEntry CreateOrUpdateAddressableAssetEntry(
313319
foreach (var dynamicLabel in rule.dynamicLabels)
314320
{
315321
var label = rule.ParseReplacement(assetPath, dynamicLabel);
316-
settings.AddLabel(label);
317-
entry.labels.Add(label);
322+
entry.SetLabel(label, true, true);
318323
}
319324
}
320325
}

β€ŽREADME.mdβ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
7171
<tr>
7272
<td align="center" valign="top" width="14.28%"><a href="http://littlebigfun.com"><img src="https://avatars2.githubusercontent.com/u/125390?v=4?s=100" width="100px;" alt="Favo Yang"/><br /><sub><b>Favo Yang</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/commits?author=favoyang" title="Code">πŸ’»</a></td>
7373
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AlkisFortuneFish"><img src="https://avatars2.githubusercontent.com/u/43749706?v=4?s=100" width="100px;" alt="AlkisFortuneFish"/><br /><sub><b>AlkisFortuneFish</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/commits?author=AlkisFortuneFish" title="Code">πŸ’»</a></td>
74-
<td align="center" valign="top" width="14.28%"><a href="http://www.insanegames.com.br"><img src="https://avatars0.githubusercontent.com/u/2972924?v=4?s=100" width="100px;" alt="Danilo Nishimura"/><br /><sub><b>Danilo Nishimura</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/commits?author=danilonishi" title="Code">πŸ’»</a></td>
74+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/danilonishi"><img src="https://avatars0.githubusercontent.com/u/2972924?v=4?s=100" width="100px;" alt="Danilo Nishimura"/><br /><sub><b>Danilo Nishimura</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/commits?author=danilonishi" title="Code">πŸ’»</a></td>
7575
<td align="center" valign="top" width="14.28%"><a href="https://github.com/K-Dark"><img src="https://avatars2.githubusercontent.com/u/44504098?v=4?s=100" width="100px;" alt="K-Dark"/><br /><sub><b>K-Dark</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/commits?author=K-Dark" title="Code">πŸ’»</a></td>
7676
<td align="center" valign="top" width="14.28%"><a href="http://www.cnblogs.com/tudas"><img src="https://avatars0.githubusercontent.com/u/1911170?v=4?s=100" width="100px;" alt="caochao"/><br /><sub><b>caochao</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/commits?author=caochao" title="Code">πŸ’»</a></td>
7777
<td align="center" valign="top" width="14.28%"><a href="https://light11.hatenadiary.com/"><img src="https://avatars0.githubusercontent.com/u/47441314?v=4?s=100" width="100px;" alt="Haruki Yano"/><br /><sub><b>Haruki Yano</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/commits?author=Haruma-K" title="Code">πŸ’»</a></td>
@@ -91,6 +91,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
9191
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ese9"><img src="https://avatars.githubusercontent.com/u/38282199?v=4?s=100" width="100px;" alt="Roman Novikov"/><br /><sub><b>Roman Novikov</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/commits?author=ese9" title="Code">πŸ’»</a></td>
9292
<td align="center" valign="top" width="14.28%"><a href="http://blog.uzutaka.com"><img src="https://avatars.githubusercontent.com/u/525643?v=4?s=100" width="100px;" alt="Takanori Uzuka"/><br /><sub><b>Takanori Uzuka</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/commits?author=takanori" title="Code">πŸ’»</a></td>
9393
<td align="center" valign="top" width="14.28%"><a href="https://github.com/vanifatovvlad"><img src="https://avatars.githubusercontent.com/u/26966368?v=4?s=100" width="100px;" alt="VladV"/><br /><sub><b>VladV</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/commits?author=vanifatovvlad" title="Code">πŸ’»</a></td>
94+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Brian-Jiang"><img src="https://avatars.githubusercontent.com/u/35553805?v=4?s=100" width="100px;" alt="Brian"/><br /><sub><b>Brian</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/commits?author=Brian-Jiang" title="Code">πŸ’»</a></td>
95+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/rlintott"><img src="https://avatars.githubusercontent.com/u/50784910?v=4?s=100" width="100px;" alt="Ryan"/><br /><sub><b>Ryan</b></sub></a><br /><a href="https://github.com/favoyang/unity-addressable-importer/issues?q=author%3Arlintott" title="Bug reports">πŸ›</a></td>
9496
</tr>
9597
</tbody>
9698
</table>

β€Žpackage.jsonβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "com.littlebigfun.addressable-importer",
33
"displayName": "Unity Addressable Importer",
4-
"version": "0.16.1",
4+
"version": "0.17.0",
55
"unity": "2018.3",
6-
"description": "A simple rule based addressable asset importer.",
6+
"description": "A simple rule-based addressable asset importer.",
77
"dependencies": {
8-
"com.unity.addressables": "1.1.5"
8+
"com.unity.addressables": "1.19.19"
99
},
1010
"author": {
1111
"name": "Favo Yang",

0 commit comments

Comments
Β (0)