diff --git a/spine-tk2d/Example/Example.unity b/spine-tk2d/Example/Example.unity index 632a25b4a..5894de058 100644 Binary files a/spine-tk2d/Example/Example.unity and b/spine-tk2d/Example/Example.unity differ diff --git a/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlas.prefab b/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlas.prefab deleted file mode 100644 index d16f8559a..000000000 Binary files a/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlas.prefab and /dev/null differ diff --git a/spine-tk2d/Example/Spineboy/Altas/SpineboyMaterial.mat b/spine-tk2d/Example/Spineboy/Altas/SpineboyMaterial.mat deleted file mode 100644 index f593b1321..000000000 Binary files a/spine-tk2d/Example/Spineboy/Altas/SpineboyMaterial.mat and /dev/null differ diff --git a/spine-tk2d/Example/Spineboy/Altas.meta b/spine-tk2d/Example/Spineboy/Atlas.meta similarity index 56% rename from spine-tk2d/Example/Spineboy/Altas.meta rename to spine-tk2d/Example/Spineboy/Atlas.meta index 1441e5ced..ca1eb4036 100644 --- a/spine-tk2d/Example/Spineboy/Altas.meta +++ b/spine-tk2d/Example/Spineboy/Atlas.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: 1b290ad24ac5c0d48a707d637f1fa95b +guid: fbf5933c952a61e418970dfb8a22a9c5 DefaultImporter: userData: diff --git a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data.meta b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data.meta new file mode 100644 index 000000000..5b0fbfc64 --- /dev/null +++ b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: ecf18700fc84ae94ca3cfa6d301b50c0 +DefaultImporter: + userData: diff --git a/spine-tk2d/Example/Spineboy/Altas/SpineboyMaterial.mat.meta b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas material.mat.meta similarity index 58% rename from spine-tk2d/Example/Spineboy/Altas/SpineboyMaterial.mat.meta rename to spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas material.mat.meta index c3c63a3c8..c88980aac 100644 --- a/spine-tk2d/Example/Spineboy/Altas/SpineboyMaterial.mat.meta +++ b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas material.mat.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: 74d9d6e85eeb5ec448f2c0c636345ed8 +guid: 4179f68f1f074f6419e77a5ce3326360 NativeFormatImporter: userData: diff --git a/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlas.png.meta b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.png.meta similarity index 78% rename from spine-tk2d/Example/Spineboy/Altas/SpineboyAtlas.png.meta rename to spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.png.meta index 0d933c9d1..d9f913d31 100644 --- a/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlas.png.meta +++ b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.png.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: 95ec4cafdddd2864899a670bcfe663bb +guid: 87b566031e1e98a4ca10753473e6ab43 TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -20,13 +20,13 @@ TextureImporter: grayScaleToAlpha: 0 generateCubemap: 0 seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 512 + textureFormat: -1 + maxTextureSize: 1024 textureSettings: - filterMode: 1 - aniso: 0 + filterMode: -1 + aniso: -1 mipBias: -1 - wrapMode: 1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 diff --git a/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlasData.prefab b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab similarity index 51% rename from spine-tk2d/Example/Spineboy/Altas/SpineboyAtlasData.prefab rename to spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab index d88de194d..04503b943 100644 Binary files a/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlasData.prefab and b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab differ diff --git a/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlas.prefab.meta b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab.meta similarity index 58% rename from spine-tk2d/Example/Spineboy/Altas/SpineboyAtlas.prefab.meta rename to spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab.meta index 89ea0d2ca..3d0e83bf9 100644 --- a/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlas.prefab.meta +++ b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: fd73ca199e8da1b45ad5acbcb2852f85 +guid: 75ba18a107160134091f702a9e446567 NativeFormatImporter: userData: diff --git a/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlasData.prefab.meta b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlasData.prefab.meta similarity index 58% rename from spine-tk2d/Example/Spineboy/Altas/SpineboyAtlasData.prefab.meta rename to spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlasData.prefab.meta index 10fcfc35c..009804a9b 100644 --- a/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlasData.prefab.meta +++ b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlasData.prefab.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: d851f51ee5bf0f4478d45aec10e9e3fb +guid: 51da69e827bd6824f9f747e9726b91be NativeFormatImporter: userData: diff --git a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/atlas0 material.mat b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/atlas0 material.mat new file mode 100644 index 000000000..5bf47f106 Binary files /dev/null and b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/atlas0 material.mat differ diff --git a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/atlas0 material.mat.meta b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/atlas0 material.mat.meta new file mode 100644 index 000000000..24292fb50 --- /dev/null +++ b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/atlas0 material.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: db97ecfecb17b6f458e01069ad10927d +NativeFormatImporter: + userData: diff --git a/spine-tk2d/Example/Spineboy/Altas/SpineboyAtlas.png b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/atlas0.png similarity index 100% rename from spine-tk2d/Example/Spineboy/Altas/SpineboyAtlas.png rename to spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/atlas0.png diff --git a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/atlas0.png.meta b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/atlas0.png.meta new file mode 100644 index 000000000..aed381d59 --- /dev/null +++ b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/atlas0.png.meta @@ -0,0 +1,35 @@ +fileFormatVersion: 2 +guid: 9685688f4dc78cc4c980b5b39c9a6c7e +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 256 + textureSettings: + filterMode: 1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + textureType: -1 + buildTargetSettings: [] + userData: diff --git a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas.prefab b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas.prefab index 2f50342a7..4e78a9631 100644 Binary files a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas.prefab and b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas.prefab differ diff --git a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas.prefab.meta b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas.prefab.meta new file mode 100644 index 000000000..1688fe351 --- /dev/null +++ b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas.prefab.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: e04ef676426682f4fbe2b2e248bc3dc4 +NativeFormatImporter: + userData: diff --git a/spine-tk2d/Example/Spineboy/Skeleton/SpineboySkeletonAsset.asset b/spine-tk2d/Example/Spineboy/Skeleton/SpineboySkeletonAsset.asset index 84d02c826..03a8d2bac 100644 Binary files a/spine-tk2d/Example/Spineboy/Skeleton/SpineboySkeletonAsset.asset and b/spine-tk2d/Example/Spineboy/Skeleton/SpineboySkeletonAsset.asset differ diff --git a/spine-tk2d/README.md.meta b/spine-tk2d/README.md.meta new file mode 100644 index 000000000..393585aa1 --- /dev/null +++ b/spine-tk2d/README.md.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 068c1d5710e913d40955e13203f11eed +DefaultImporter: + userData: