diff --git a/examples/export/runtimes.sh b/examples/export/runtimes.sh index 16badb369..0435907a4 100755 --- a/examples/export/runtimes.sh +++ b/examples/export/runtimes.sh @@ -445,9 +445,9 @@ UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon cp -f ../dragon/export/dragon-ess.json "$UNITY_TARGET_DIR/dragon.json" cp -f ../dragon/export/dragon-pma.atlas "$UNITY_TARGET_DIR/dragon.atlas.txt" sed -i 's/dragon-pma.png/dragon.png/g' "$UNITY_TARGET_DIR/dragon.atlas.txt" -sed -i 's/dragon-pma2.png/dragon2.png/g' "$UNITY_TARGET_DIR/dragon.atlas.txt" +sed -i 's/dragon-pma_2.png/dragon2.png/g' "$UNITY_TARGET_DIR/dragon.atlas.txt" cp -f ../dragon/export/dragon-pma.png "$UNITY_TARGET_DIR/dragon.png" -cp -f ../dragon/export/dragon-pma2.png "$UNITY_TARGET_DIR/dragon2.png" +cp -f ../dragon/export/dragon-pma_2.png "$UNITY_TARGET_DIR/dragon2.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins" cp -f ../goblins/export/goblins-pro.json "$UNITY_TARGET_DIR/goblins.json" diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt index 71e7d2b3e..8e0e4e741 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt @@ -1,4 +1,4 @@ -dragon-pma.png +dragon.png size: 1024, 1024 filter: Linear, Linear pma: true @@ -87,7 +87,7 @@ tail06 thiagobrayner bounds: 54, 912, 350, 31 -dragon-pma2.png +dragon2.png size: 1024, 512 filter: Linear, Linear pma: true diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.json index 1f84045c7..a83cd7d1c 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "UIFpNNbbcQI", - "spine": "4.0.58-beta", + "spine": "4.0.59-beta", "x": -366.31, "y": -286.62, "width": 660.39, diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SpineAtlasAsset.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SpineAtlasAsset.cs index 9d7cecf26..9f4c03e58 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SpineAtlasAsset.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SpineAtlasAsset.cs @@ -71,8 +71,9 @@ namespace Spine.Unity { string[] atlasLines = atlasString.Split('\n'); var pages = new List(); for (int i = 0; i < atlasLines.Length - 1; i++) { - if (atlasLines[i].Trim().Length == 0) - pages.Add(atlasLines[i + 1].Trim().Replace(".png", "")); + string line = atlasLines[i].Trim(); + if (line.EndsWith(".png")) + pages.Add(line.Replace(".png", "")); } // Populate Materials[] by matching texture names with page names.