From fab469dbf3427c878ccb2ac5c1b782f7d69e5089 Mon Sep 17 00:00:00 2001 From: pharan Date: Sat, 27 Feb 2016 01:57:40 +0800 Subject: [PATCH] Fixed TK2D type name --- spine-unity/Assets/spine-unity/Modules/TK2D.meta | 9 +++++++++ .../{ => TK2D}/SpriteCollectionAttachmentLoader.cs | 4 ++-- .../{ => TK2D}/SpriteCollectionAttachmentLoader.cs.meta | 0 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 spine-unity/Assets/spine-unity/Modules/TK2D.meta rename spine-unity/Assets/spine-unity/Modules/{ => TK2D}/SpriteCollectionAttachmentLoader.cs (97%) rename spine-unity/Assets/spine-unity/Modules/{ => TK2D}/SpriteCollectionAttachmentLoader.cs.meta (100%) diff --git a/spine-unity/Assets/spine-unity/Modules/TK2D.meta b/spine-unity/Assets/spine-unity/Modules/TK2D.meta new file mode 100644 index 000000000..bd32abb64 --- /dev/null +++ b/spine-unity/Assets/spine-unity/Modules/TK2D.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e70d3026a0242e5418232b2015be29f7 +folderAsset: yes +timeCreated: 1456509301 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/spine-unity/Modules/SpriteCollectionAttachmentLoader.cs b/spine-unity/Assets/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs similarity index 97% rename from spine-unity/Assets/spine-unity/Modules/SpriteCollectionAttachmentLoader.cs rename to spine-unity/Assets/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs index 3b6235532..b9c10613a 100644 --- a/spine-unity/Assets/spine-unity/Modules/SpriteCollectionAttachmentLoader.cs +++ b/spine-unity/Assets/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs @@ -138,10 +138,10 @@ public class SpriteCollectionAttachmentLoader : AttachmentLoader { return mesh; } - public SkinnedMeshAttachment NewSkinnedMeshAttachment (Skin skin, String name, String path) { + public WeightedMeshAttachment NewWeightedMeshAttachment (Skin skin, String name, String path) { ProcessSpriteDefinition(path); - SkinnedMeshAttachment mesh = new SkinnedMeshAttachment(name); + WeightedMeshAttachment mesh = new WeightedMeshAttachment(name); mesh.Path = path; mesh.RendererObject = material; mesh.RegionU = u; diff --git a/spine-unity/Assets/spine-unity/Modules/SpriteCollectionAttachmentLoader.cs.meta b/spine-unity/Assets/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs.meta similarity index 100% rename from spine-unity/Assets/spine-unity/Modules/SpriteCollectionAttachmentLoader.cs.meta rename to spine-unity/Assets/spine-unity/Modules/TK2D/SpriteCollectionAttachmentLoader.cs.meta