From 88c580458647a97eb47dc9edd6c696a3d304f6be Mon Sep 17 00:00:00 2001 From: Perfare Date: Sat, 4 Dec 2021 09:23:41 +0800 Subject: [PATCH] Fixed #886 --- AssetStudio/AssetsManager.cs | 4 ++++ AssetStudio/Classes/SpriteAtlas.cs | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/AssetStudio/AssetsManager.cs b/AssetStudio/AssetsManager.cs index ffdc4b2..4f8edb9 100644 --- a/AssetStudio/AssetsManager.cs +++ b/AssetStudio/AssetsManager.cs @@ -424,6 +424,10 @@ namespace AssetStudio } else if (obj is SpriteAtlas m_SpriteAtlas) { + if (m_SpriteAtlas.m_IsVariant) + { + continue; + } foreach (var m_PackedSprite in m_SpriteAtlas.m_PackedSprites) { if (m_PackedSprite.TryGet(out var m_Sprite)) diff --git a/AssetStudio/Classes/SpriteAtlas.cs b/AssetStudio/Classes/SpriteAtlas.cs index 2a71c30..c1a97c5 100644 --- a/AssetStudio/Classes/SpriteAtlas.cs +++ b/AssetStudio/Classes/SpriteAtlas.cs @@ -46,6 +46,7 @@ namespace AssetStudio { public PPtr[] m_PackedSprites; public Dictionary, SpriteAtlasData> m_RenderDataMap; + public bool m_IsVariant; public SpriteAtlas(ObjectReader reader) : base(reader) { @@ -67,8 +68,9 @@ namespace AssetStudio var value = new SpriteAtlasData(reader); m_RenderDataMap.Add(new KeyValuePair(first, second), value); } - //string m_Tag - //bool m_IsVariant + var m_Tag = reader.ReadAlignedString(); + m_IsVariant = reader.ReadBoolean(); + reader.AlignStream(); } } }