UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed Materials in separate directory being deleted upon reimport. Closes #2560.

Browse Source
This commit is contained in:
Harald Csaszar 2024-06-25 19:09:59 +02:00
parent 24070b4768
commit 6df18e22d3
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
View File

@ -642,6 +642,7 @@ namespace Spine.Unity.Editor {
} }
List<Material> populatingMaterials = new List<Material>(pageFiles.Count); List<Material> populatingMaterials = new List<Material>(pageFiles.Count);
string materialDirectory = GetMaterialDirectory(assetPath, vestigialMaterials);
for (int i = 0; i < pageFiles.Count; i++) { for (int i = 0; i < pageFiles.Count; i++) {
string texturePath = assetPath + "/" + pageFiles[i]; string texturePath = assetPath + "/" + pageFiles[i];
@ -660,9 +661,8 @@ namespace Spine.Unity.Editor {
if (pageName == primaryName && pageFiles.Count == 1) if (pageName == primaryName && pageFiles.Count == 1)
pageName = "Material"; pageName = "Material";
string materialPath = assetPath + "/" + primaryName + "_" + pageName + ".mat"; string materialPath = materialDirectory + "/" + primaryName + "_" + pageName + ".mat";
Material material = (Material)AssetDatabase.LoadAssetAtPath(materialPath, typeof(Material)); Material material = (Material)AssetDatabase.LoadAssetAtPath(materialPath, typeof(Material));
if (material == null) { if (material == null) {
Shader defaultShader = GetDefaultShader(); Shader defaultShader = GetDefaultShader();
material = defaultShader != null ? new Material(defaultShader) : null; material = defaultShader != null ? new Material(defaultShader) : null;
@ -836,7 +836,6 @@ namespace Spine.Unity.Editor {
string primaryName = spriteAtlas.name; string primaryName = spriteAtlas.name;
string assetPath = Path.GetDirectoryName(AssetDatabase.GetAssetPath(spriteAtlas)).Replace('\\', '/'); string assetPath = Path.GetDirectoryName(AssetDatabase.GetAssetPath(spriteAtlas)).Replace('\\', '/');
string atlasPath = assetPath + "/" + primaryName + SpriteAtlasSuffix + ".asset"; string atlasPath = assetPath + "/" + primaryName + SpriteAtlasSuffix + ".asset";
SpineSpriteAtlasAsset atlasAsset = AssetDatabase.LoadAssetAtPath<SpineSpriteAtlasAsset>(atlasPath); SpineSpriteAtlasAsset atlasAsset = AssetDatabase.LoadAssetAtPath<SpineSpriteAtlasAsset>(atlasPath);
@ -900,6 +899,15 @@ namespace Spine.Unity.Editor {
return (AtlasAssetBase)AssetDatabase.LoadAssetAtPath(atlasPath, typeof(AtlasAssetBase)); return (AtlasAssetBase)AssetDatabase.LoadAssetAtPath(atlasPath, typeof(AtlasAssetBase));
} }
static string GetMaterialDirectory (string assetPath, List<Material> previousMaterials) {
if (previousMaterials.Count > 0 && previousMaterials[0] != null) {
string materialPath = AssetDatabase.GetAssetPath(previousMaterials[0]);
string materialDirectory = Path.GetDirectoryName(materialPath).Replace('\\', '/');
return materialDirectory;
}
return assetPath;
}
static bool SetDefaultTextureSettings (string texturePath, SpineAtlasAsset atlasAsset) { static bool SetDefaultTextureSettings (string texturePath, SpineAtlasAsset atlasAsset) {
TextureImporter texImporter = (TextureImporter)TextureImporter.GetAtPath(texturePath); TextureImporter texImporter = (TextureImporter)TextureImporter.GetAtPath(texturePath);
if (texImporter == null) { if (texImporter == null) {

2
spine-unity/Assets/Spine/package.json
View File

@ -2,7 +2,7 @@
"name": "com.esotericsoftware.spine.spine-unity", "name": "com.esotericsoftware.spine.spine-unity",
"displayName": "spine-unity Runtime", "displayName": "spine-unity Runtime",
"description": "This plugin provides the spine-unity runtime core.", "description": "This plugin provides the spine-unity runtime core.",
"version": "4.2.73", "version": "4.2.74",
"unity": "2018.3", "unity": "2018.3",
"author": { "author": {
"name": "Esoteric Software", "name": "Esoteric Software",