Browse Source

Merge branch '3.6-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.6-beta

badlogic 8 years ago
parent
commit
a7ca424e3f
56 changed files with 1202 additions and 856 deletions
  1. 2 0
      spine-unity/Assets/Examples/Scripts/MixAndMatch.cs
  2. 9 0
      spine-unity/Assets/Examples/Scripts/Sample Components.meta
  3. 0 0
      spine-unity/Assets/Examples/Scripts/Sample Components/AtlasRegionAttacher.cs
  4. 0 0
      spine-unity/Assets/Examples/Scripts/Sample Components/AtlasRegionAttacher.cs.meta
  5. 0 0
      spine-unity/Assets/Examples/Scripts/Sample Components/SpriteAttacher.cs
  6. 0 0
      spine-unity/Assets/Examples/Scripts/Sample Components/SpriteAttacher.cs.meta
  7. 132 132
      spine-unity/Assets/Examples/Spine/Dragon/dragon.json
  8. 19 10
      spine-unity/Assets/Examples/Spine/Dragon/dragon.png.meta
  9. 19 10
      spine-unity/Assets/Examples/Spine/Dragon/dragon2.png.meta
  10. BIN
      spine-unity/Assets/Examples/Spine/Dragon/dragon_Atlas.asset
  11. BIN
      spine-unity/Assets/Examples/Spine/Dragon/dragon_dragon.mat
  12. BIN
      spine-unity/Assets/Examples/Spine/Dragon/dragon_dragon2.mat
  13. 1 1
      spine-unity/Assets/Examples/Spine/Eyes/eyes.json
  14. 19 10
      spine-unity/Assets/Examples/Spine/Eyes/eyes.png.meta
  15. BIN
      spine-unity/Assets/Examples/Spine/Eyes/eyes_Atlas.asset
  16. BIN
      spine-unity/Assets/Examples/Spine/Eyes/eyes_Material.mat
  17. 19 10
      spine-unity/Assets/Examples/Spine/FootSoldier/Equipment/Equipment.png.meta
  18. BIN
      spine-unity/Assets/Examples/Spine/FootSoldier/Equipment/Equipment_Atlas.asset
  19. BIN
      spine-unity/Assets/Examples/Spine/FootSoldier/Equipment/Equipment_Material.mat
  20. 19 10
      spine-unity/Assets/Examples/Spine/FootSoldier/FS_White.png.meta
  21. BIN
      spine-unity/Assets/Examples/Spine/FootSoldier/FS_White_Atlas.asset
  22. BIN
      spine-unity/Assets/Examples/Spine/FootSoldier/FS_White_Material.mat
  23. 1 1
      spine-unity/Assets/Examples/Spine/FootSoldier/FootSoldier.json
  24. 1 1
      spine-unity/Assets/Examples/Spine/Gauge/Gauge.json
  25. 19 10
      spine-unity/Assets/Examples/Spine/Gauge/Gauge.png.meta
  26. BIN
      spine-unity/Assets/Examples/Spine/Gauge/Gauge_Atlas.asset
  27. BIN
      spine-unity/Assets/Examples/Spine/Gauge/Gauge_Material.mat
  28. 212 213
      spine-unity/Assets/Examples/Spine/Goblins/goblins.json
  29. 19 10
      spine-unity/Assets/Examples/Spine/Goblins/goblins.png.meta
  30. BIN
      spine-unity/Assets/Examples/Spine/Goblins/goblins_Atlas.asset
  31. BIN
      spine-unity/Assets/Examples/Spine/Goblins/goblins_Material.mat
  32. 30 37
      spine-unity/Assets/Examples/Spine/Hero/hero-mesh.json
  33. 20 11
      spine-unity/Assets/Examples/Spine/Hero/hero-mesh.png.meta
  34. BIN
      spine-unity/Assets/Examples/Spine/Hero/hero-mesh_Atlas.asset
  35. BIN
      spine-unity/Assets/Examples/Spine/Hero/hero-mesh_Material.mat
  36. 24 24
      spine-unity/Assets/Examples/Spine/Raggedy Spineboy/Raggedy Spineboy.json
  37. 19 10
      spine-unity/Assets/Examples/Spine/Raggedy Spineboy/Raggedy Spineboy.png.meta
  38. BIN
      spine-unity/Assets/Examples/Spine/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset
  39. BIN
      spine-unity/Assets/Examples/Spine/Raggedy Spineboy/Raggedy Spineboy_Material.mat
  40. 106 109
      spine-unity/Assets/Examples/Spine/Raptor/raptor.json
  41. 19 10
      spine-unity/Assets/Examples/Spine/Raptor/raptor.png.meta
  42. BIN
      spine-unity/Assets/Examples/Spine/Raptor/raptor_Atlas.asset
  43. BIN
      spine-unity/Assets/Examples/Spine/Raptor/raptor_Material.mat
  44. 317 73
      spine-unity/Assets/Examples/Spine/Spineboy/spineboy.json
  45. 19 10
      spine-unity/Assets/Examples/Spine/Spineboy/spineboy.png.meta
  46. BIN
      spine-unity/Assets/Examples/Spine/Spineboy/spineboy_Atlas.asset
  47. BIN
      spine-unity/Assets/Examples/Spine/Spineboy/spineboy_Material.mat
  48. 1 1
      spine-unity/Assets/Examples/Spine/Spineboy/spineboy_SkeletonData.asset
  49. 62 62
      spine-unity/Assets/Examples/Spine/Spineunitygirl/Doi.json
  50. 19 10
      spine-unity/Assets/Examples/Spine/Spineunitygirl/Doi.png.meta
  51. BIN
      spine-unity/Assets/Examples/Spine/Spineunitygirl/Doi_Atlas.asset
  52. BIN
      spine-unity/Assets/Examples/Spine/Spineunitygirl/Doi_Material.mat
  53. 19 10
      spine-unity/Assets/Examples/Spine/Strechyman/stretchyman-diffuse-pma.png.meta
  54. BIN
      spine-unity/Assets/Examples/Spine/Strechyman/stretchyman-diffuse-pma_Atlas.asset
  55. BIN
      spine-unity/Assets/Examples/Spine/Strechyman/stretchyman-diffuse-pma_Material.mat
  56. 56 71
      spine-unity/Assets/Examples/Spine/Strechyman/stretchyman.json

+ 2 - 0
spine-unity/Assets/Examples/Scripts/MixAndMatch.cs

@@ -106,6 +106,8 @@ namespace Spine.Unity.Examples {
 			skeleton.SetSkin(newSkin);
 			skeleton.SetToSetupPose();
 			skeleton.SetAttachment(weaponSlot, daggerName);
+
+			Resources.UnloadUnusedAssets();
 		}
 
 	}

+ 9 - 0
spine-unity/Assets/Examples/Scripts/Sample Components.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 037ce88b9252fd241bd99d71721d9205
+folderAsset: yes
+timeCreated: 1481879243
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
spine-unity/Assets/spine-unity/Modules/AttachmentTools/AtlasRegionAttacher.cs → spine-unity/Assets/Examples/Scripts/Sample Components/AtlasRegionAttacher.cs


+ 0 - 0
spine-unity/Assets/spine-unity/Modules/AttachmentTools/AtlasRegionAttacher.cs.meta → spine-unity/Assets/Examples/Scripts/Sample Components/AtlasRegionAttacher.cs.meta


+ 0 - 0
spine-unity/Assets/spine-unity/Modules/AttachmentTools/SpriteAttacher.cs → spine-unity/Assets/Examples/Scripts/Sample Components/SpriteAttacher.cs


+ 0 - 0
spine-unity/Assets/spine-unity/Modules/AttachmentTools/SpriteAttacher.cs.meta → spine-unity/Assets/Examples/Scripts/Sample Components/SpriteAttacher.cs.meta


+ 132 - 132
spine-unity/Assets/Examples/Spine/Dragon/dragon.json

@@ -1,39 +1,39 @@
 {
-"skeleton": { "hash": "Mc0suer5LoUZv7DvFA3mLFATKFU", "spine": "3.5.03-beta", "width": 897, "height": 716.36, "fps": 30, "images": "./images/" },
+"skeleton": { "hash": "wKRjA+djIs9K05d/19sZhwmP3Ow", "spine": "3.6.05-beta", "width": 897, "height": 716.36, "images": "./images/" },
 "bones": [
 	{ "name": "root", "y": -176.12 },
 	{ "name": "COG", "parent": "root", "y": 176.12 },
-	{ "name": "chest", "parent": "COG", "length": 31.24, "rotation": 161.7, "x": 52.52, "y": 15.34 },
-	{ "name": "L_front_thigh", "parent": "chest", "length": 67.42, "rotation": 138.94, "x": -45.58, "y": 7.92 },
-	{ "name": "L_front_leg", "parent": "L_front_thigh", "length": 51.57, "rotation": 43.36, "x": 67.42, "y": 0.02 },
-	{ "name": "L_front_toe1", "parent": "L_front_leg", "length": 51.44, "rotation": -98, "x": 45.53, "y": 2.43 },
-	{ "name": "L_front_toe2", "parent": "L_front_leg", "length": 61.97, "rotation": -55.26, "x": 51.57, "y": -0.12 },
-	{ "name": "L_front_toe3", "parent": "L_front_leg", "length": 45.65, "rotation": -11.13, "x": 54.19, "y": 0.6, "scaleX": 1.134 },
-	{ "name": "L_front_toe4", "parent": "L_front_leg", "length": 53.47, "rotation": 19.42, "x": 50.6, "y": 7.08, "scaleX": 1.134 },
-	{ "name": "back", "parent": "COG", "length": 115.37, "rotation": 151.83, "x": 16.03, "y": 27.94 },
-	{ "name": "R_rear_thigh", "parent": "back", "length": 123.46, "rotation": 104.87, "x": 65.31, "y": 59.89 },
-	{ "name": "L_rear_thigh", "parent": "R_rear_thigh", "length": 88.05, "rotation": 28.35, "x": -8.59, "y": 30.18 },
+	{ "name": "chest", "parent": "COG", "length": 31.24, "rotation": 161.7, "x": 52.53, "y": 15.35 },
+	{ "name": "L_front_thigh", "parent": "chest", "length": 67.42, "rotation": 138.94, "x": -45.59, "y": 7.93 },
+	{ "name": "L_front_leg", "parent": "L_front_thigh", "length": 51.58, "rotation": 43.36, "x": 67.42, "y": 0.03 },
+	{ "name": "L_front_toe1", "parent": "L_front_leg", "length": 51.45, "rotation": -98.01, "x": 45.54, "y": 2.43 },
+	{ "name": "L_front_toe2", "parent": "L_front_leg", "length": 61.98, "rotation": -55.26, "x": 51.58, "y": -0.13 },
+	{ "name": "L_front_toe3", "parent": "L_front_leg", "length": 45.65, "rotation": -11.14, "x": 54.19, "y": 0.6, "scaleX": 1.135 },
+	{ "name": "L_front_toe4", "parent": "L_front_leg", "length": 53.47, "rotation": 19.43, "x": 50.61, "y": 7.09, "scaleX": 1.135 },
+	{ "name": "back", "parent": "COG", "length": 115.38, "rotation": 151.83, "x": 16.04, "y": 27.94 },
+	{ "name": "R_rear_thigh", "parent": "back", "length": 123.47, "rotation": 104.88, "x": 65.31, "y": 59.89 },
+	{ "name": "L_rear_thigh", "parent": "R_rear_thigh", "length": 88.06, "rotation": 28.35, "x": -8.59, "y": 30.19 },
 	{ "name": "L_rear_leg", "parent": "L_rear_thigh", "length": 103.74, "rotation": -122.41, "x": 96.04, "y": -0.97 },
-	{ "name": "L_wing", "parent": "chest", "length": 301.12, "rotation": -75.51, "x": -7.24, "y": -24.65 },
-	{ "name": "R_front_thigh", "parent": "chest", "length": 81.63, "rotation": 67.96, "x": -10.89, "y": 28.25 },
-	{ "name": "R_front_leg", "parent": "R_front_thigh", "length": 66.52, "rotation": 92.7, "x": 83.04, "y": -0.3 },
-	{ "name": "R_front_toe1", "parent": "R_front_leg", "length": 46.65, "rotation": 8.59, "x": 70.03, "y": 5.31 },
-	{ "name": "R_front_toe2", "parent": "R_front_leg", "length": 53.66, "rotation": -35.02, "x": 66.52, "y": 0.33 },
-	{ "name": "R_front_toe3", "parent": "R_front_leg", "length": 58.38, "rotation": -74.67, "x": 62.1, "y": -0.79 },
-	{ "name": "R_rear_leg", "parent": "R_rear_thigh", "length": 91.06, "rotation": -129.04, "x": 123.46, "y": -0.26 },
-	{ "name": "R_rear_toe1", "parent": "R_rear_leg", "length": 94.99, "rotation": 141.98, "x": 90.06, "y": 2.12 },
+	{ "name": "L_wing", "parent": "chest", "length": 301.12, "rotation": -75.51, "x": -7.25, "y": -24.66 },
+	{ "name": "R_front_thigh", "parent": "chest", "length": 81.64, "rotation": 67.97, "x": -10.89, "y": 28.25 },
+	{ "name": "R_front_leg", "parent": "R_front_thigh", "length": 66.53, "rotation": 92.7, "x": 83.05, "y": -0.31 },
+	{ "name": "R_front_toe1", "parent": "R_front_leg", "length": 46.66, "rotation": 8.59, "x": 70.03, "y": 5.31 },
+	{ "name": "R_front_toe2", "parent": "R_front_leg", "length": 53.67, "rotation": -35.02, "x": 66.53, "y": 0.34 },
+	{ "name": "R_front_toe3", "parent": "R_front_leg", "length": 58.39, "rotation": -74.67, "x": 62.1, "y": -0.79 },
+	{ "name": "R_rear_leg", "parent": "R_rear_thigh", "length": 91.06, "rotation": -129.04, "x": 123.47, "y": -0.27 },
+	{ "name": "R_rear_toe1", "parent": "R_rear_leg", "length": 95, "rotation": 141.98, "x": 90.07, "y": 2.12 },
 	{ "name": "R_rear_toe2", "parent": "R_rear_leg", "length": 99.29, "rotation": 125.32, "x": 89.6, "y": 1.52 },
-	{ "name": "R_rear_toe3", "parent": "R_rear_leg", "length": 103.45, "rotation": 112.26, "x": 91.06, "y": -0.35 },
-	{ "name": "neck", "parent": "COG", "length": 41.36, "rotation": 39.05, "x": 64.75, "y": 11.98 },
-	{ "name": "head", "parent": "neck", "length": 188.83, "rotation": 8.06, "x": 69.96, "y": 2.49 },
-	{ "name": "R_wing", "parent": "head", "length": 359.5, "rotation": 83.21, "x": -74.68, "y": 20.9 },
-	{ "name": "chin", "parent": "neck", "length": 153.15, "rotation": -69.07, "x": 64.62, "y": -6.99 },
-	{ "name": "tail1", "parent": "back", "length": 65.65, "rotation": 44.31, "x": 115.37, "y": -0.19 },
-	{ "name": "tail2", "parent": "tail1", "length": 54.5, "rotation": 12, "x": 65.65, "y": 0.22 },
+	{ "name": "R_rear_toe3", "parent": "R_rear_leg", "length": 103.46, "rotation": 112.27, "x": 91.06, "y": -0.35 },
+	{ "name": "neck", "parent": "COG", "length": 41.37, "rotation": 39.06, "x": 64.76, "y": 11.98 },
+	{ "name": "head", "parent": "neck", "length": 188.84, "rotation": 8.07, "x": 69.96, "y": 2.5 },
+	{ "name": "R_wing", "parent": "head", "length": 359.5, "rotation": 83.21, "x": -74.68, "y": 20.91 },
+	{ "name": "chin", "parent": "neck", "length": 153.16, "rotation": -69.07, "x": 64.63, "y": -6.99 },
+	{ "name": "tail1", "parent": "back", "length": 65.65, "rotation": 44.32, "x": 115.38, "y": -0.2 },
+	{ "name": "tail2", "parent": "tail1", "length": 54.5, "rotation": 12, "x": 65.65, "y": 0.23 },
 	{ "name": "tail3", "parent": "tail2", "length": 41.78, "rotation": 1.8, "x": 54.5, "y": 0.37 },
 	{ "name": "tail4", "parent": "tail3", "length": 34.19, "rotation": -1.8, "x": 41.78, "y": 0.16 },
-	{ "name": "tail5", "parent": "tail4", "length": 32.32, "rotation": -3.15, "x": 34.19, "y": -0.19 },
-	{ "name": "tail6", "parent": "tail5", "length": 80.08, "rotation": -29.55, "x": 32.32, "y": -0.23 }
+	{ "name": "tail5", "parent": "tail4", "length": 32.33, "rotation": -3.15, "x": 34.19, "y": -0.19 },
+	{ "name": "tail6", "parent": "tail5", "length": 80.08, "rotation": -29.55, "x": 32.33, "y": -0.23 }
 ],
 "slots": [
 	{ "name": "L_rear_leg", "bone": "L_rear_leg", "attachment": "L_rear_leg" },
@@ -71,113 +71,113 @@
 "skins": {
 	"default": {
 		"L_front_leg": {
-			"L_front_leg": { "x": 14.68, "y": 0.48, "rotation": 15.99, "width": 84, "height": 57 }
+			"L_front_leg": { "x": 14.69, "y": 0.49, "rotation": 16, "width": 84, "height": 57 }
 		},
 		"L_front_thigh": {
-			"L_front_thigh": { "x": 27.66, "y": -11.58, "rotation": 58.66, "width": 84, "height": 72 }
+			"L_front_thigh": { "x": 27.66, "y": -11.59, "rotation": 58.66, "width": 84, "height": 72 }
 		},
 		"L_front_toe1": {
-			"front_toeA": { "x": 31.92, "y": 0.61, "rotation": 109.55, "width": 29, "height": 50 }
+			"front_toeA": { "x": 31.93, "y": 0.61, "rotation": 109.56, "width": 29, "height": 50 }
 		},
 		"L_front_toe2": {
-			"front_toeB": { "x": 26.83, "y": -4.94, "rotation": 109.51, "width": 56, "height": 57 }
+			"front_toeB": { "x": 26.84, "y": -4.95, "rotation": 109.51, "width": 56, "height": 57 }
 		},
 		"L_front_toe3": {
-			"front_toeB": { "x": 18.21, "y": -7.21, "scaleX": 0.881, "scaleY": 0.94, "rotation": 99.71, "width": 56, "height": 57 }
+			"front_toeB": { "x": 18.22, "y": -7.22, "scaleX": 0.881, "scaleY": 0.941, "rotation": 99.71, "width": 56, "height": 57 }
 		},
 		"L_front_toe4": {
-			"front_toeB": { "x": 23.21, "y": -11.68, "scaleX": 0.881, "rotation": 79.89, "width": 56, "height": 57 }
+			"front_toeB": { "x": 23.21, "y": -11.69, "scaleX": 0.881, "rotation": 79.89, "width": 56, "height": 57 }
 		},
 		"L_rear_leg": {
-			"L_rear_leg": { "x": 67.29, "y": 12.62, "rotation": -162.65, "width": 206, "height": 177 }
+			"L_rear_leg": { "x": 67.29, "y": 12.63, "rotation": -162.65, "width": 206, "height": 177 }
 		},
 		"L_rear_thigh": {
-			"L_rear_thigh": { "x": 56.03, "y": 27.38, "rotation": 74.93, "width": 91, "height": 149 }
+			"L_rear_thigh": { "x": 56.03, "y": 27.39, "rotation": 74.94, "width": 91, "height": 149 }
 		},
 		"L_wing": {
 			"L_wing01": { "x": 129.21, "y": -45.49, "rotation": -83.7, "width": 191, "height": 256 },
-			"L_wing02": { "x": 126.37, "y": -31.69, "rotation": -86.18, "width": 179, "height": 269 },
-			"L_wing03": { "x": 110.26, "y": -90.89, "rotation": -86.18, "width": 186, "height": 207 },
-			"L_wing04": { "x": -61.61, "y": -83.26, "rotation": -86.18, "width": 188, "height": 135 },
-			"L_wing05": { "x": -90.01, "y": -78.14, "rotation": -86.18, "width": 218, "height": 213 },
-			"L_wing06": { "x": -143.76, "y": -83.71, "rotation": -86.18, "width": 192, "height": 331 },
-			"L_wing07": { "x": -133.04, "y": -33.89, "rotation": -86.18, "width": 159, "height": 255 },
-			"L_wing08": { "x": 50.15, "y": -15.71, "rotation": -86.18, "width": 164, "height": 181 },
-			"L_wing09": { "x": 85.94, "y": -11.32, "rotation": -86.18, "width": 204, "height": 167 }
+			"L_wing02": { "x": 126.38, "y": -31.69, "rotation": -86.19, "width": 179, "height": 269 },
+			"L_wing03": { "x": 110.27, "y": -90.89, "rotation": -86.19, "width": 186, "height": 207 },
+			"L_wing04": { "x": -61.62, "y": -83.27, "rotation": -86.19, "width": 188, "height": 135 },
+			"L_wing05": { "x": -90.02, "y": -78.14, "rotation": -86.19, "width": 218, "height": 213 },
+			"L_wing06": { "x": -143.77, "y": -83.72, "rotation": -86.19, "width": 192, "height": 331 },
+			"L_wing07": { "x": -133.05, "y": -33.9, "rotation": -86.19, "width": 159, "height": 255 },
+			"L_wing08": { "x": 50.15, "y": -15.71, "rotation": -86.19, "width": 164, "height": 181 },
+			"L_wing09": { "x": 85.94, "y": -11.33, "rotation": -86.19, "width": 204, "height": 167 }
 		},
 		"R_front_leg": {
-			"R_front_leg": { "x": 17.79, "y": 4.22, "rotation": 37.62, "width": 101, "height": 89 }
+			"R_front_leg": { "x": 17.8, "y": 4.23, "rotation": 37.63, "width": 101, "height": 89 }
 		},
 		"R_front_thigh": {
-			"R_front_thigh": { "x": 35.28, "y": 2.11, "rotation": 130.33, "width": 108, "height": 108 }
+			"R_front_thigh": { "x": 35.29, "y": 2.11, "rotation": 130.33, "width": 108, "height": 108 }
 		},
 		"R_front_toe1": {
-			"front_toeB": { "x": 24.49, "y": -2.61, "rotation": 104.18, "width": 56, "height": 57 }
+			"front_toeB": { "x": 24.5, "y": -2.61, "rotation": 104.18, "width": 56, "height": 57 }
 		},
 		"R_front_toe2": {
-			"front_toeB": { "x": 26.39, "y": 1.16, "rotation": 104.57, "width": 56, "height": 57 }
+			"front_toeB": { "x": 26.39, "y": 1.17, "rotation": 104.58, "width": 56, "height": 57 }
 		},
 		"R_front_toe3": {
-			"front_toeB": { "x": 30.66, "y": -0.06, "rotation": 112.29, "width": 56, "height": 57 }
+			"front_toeB": { "x": 30.67, "y": -0.07, "rotation": 112.3, "width": 56, "height": 57 }
 		},
 		"R_rear_leg": {
-			"R_rear_leg": { "x": 60.87, "y": -5.72, "rotation": -127.66, "width": 116, "height": 100 }
+			"R_rear_leg": { "x": 60.88, "y": -5.73, "rotation": -127.67, "width": 116, "height": 100 }
 		},
 		"R_rear_thigh": {
 			"R_rear_thigh": { "x": 53.25, "y": 12.58, "rotation": 103.29, "width": 91, "height": 149 }
 		},
 		"R_rear_toe1": {
-			"rear-toe": { "x": 54.75, "y": -5.72, "rotation": 134.79, "width": 109, "height": 77 }
+			"rear-toe": { "x": 54.76, "y": -5.72, "rotation": 134.79, "width": 109, "height": 77 }
 		},
 		"R_rear_toe2": {
-			"rear-toe": { "x": 57.02, "y": -7.22, "rotation": 134.42, "width": 109, "height": 77 }
+			"rear-toe": { "x": 57.03, "y": -7.23, "rotation": 134.43, "width": 109, "height": 77 }
 		},
 		"R_rear_toe3": {
 			"rear-toe": { "x": 47.46, "y": -7.64, "rotation": 134.34, "width": 109, "height": 77 }
 		},
 		"R_wing": {
-			"R_wing01": { "x": 170.08, "y": -23.67, "rotation": -130.33, "width": 219, "height": 310 },
-			"R_wing02": { "x": 171.14, "y": -19.33, "rotation": -130.33, "width": 203, "height": 305 },
-			"R_wing03": { "x": 166.46, "y": 29.23, "rotation": -130.33, "width": 272, "height": 247 },
-			"R_wing04": { "x": 42.94, "y": 134.05, "rotation": -130.33, "width": 279, "height": 144 },
-			"R_wing05": { "x": -8.83, "y": 142.59, "rotation": -130.33, "width": 251, "height": 229 },
-			"R_wing06": { "x": -123.33, "y": 111.22, "rotation": -130.33, "width": 200, "height": 366 },
-			"R_wing07": { "x": -40.17, "y": 118.03, "rotation": -130.33, "width": 200, "height": 263 },
-			"R_wing08": { "x": 48.01, "y": 28.76, "rotation": -130.33, "width": 234, "height": 254 },
-			"R_wing09": { "x": 128.1, "y": 21.12, "rotation": -130.33, "width": 248, "height": 204 }
+			"R_wing01": { "x": 170.08, "y": -23.68, "rotation": -130.34, "width": 219, "height": 310 },
+			"R_wing02": { "x": 171.15, "y": -19.33, "rotation": -130.34, "width": 203, "height": 305 },
+			"R_wing03": { "x": 166.46, "y": 29.24, "rotation": -130.34, "width": 272, "height": 247 },
+			"R_wing04": { "x": 42.94, "y": 134.06, "rotation": -130.34, "width": 279, "height": 144 },
+			"R_wing05": { "x": -8.84, "y": 142.59, "rotation": -130.34, "width": 251, "height": 229 },
+			"R_wing06": { "x": -123.33, "y": 111.22, "rotation": -130.34, "width": 200, "height": 366 },
+			"R_wing07": { "x": -40.17, "y": 118.03, "rotation": -130.34, "width": 200, "height": 263 },
+			"R_wing08": { "x": 48.02, "y": 28.76, "rotation": -130.34, "width": 234, "height": 254 },
+			"R_wing09": { "x": 128.1, "y": 21.13, "rotation": -130.34, "width": 248, "height": 204 }
 		},
 		"back": {
-			"back": { "x": 35.84, "y": 19.99, "rotation": -151.83, "width": 190, "height": 185 }
+			"back": { "x": 35.85, "y": 19.99, "rotation": -151.83, "width": 190, "height": 185 }
 		},
 		"chest": {
-			"chest": { "x": -14.6, "y": 24.78, "rotation": -161.7, "width": 136, "height": 122 }
+			"chest": { "x": -14.6, "y": 24.79, "rotation": -161.7, "width": 136, "height": 122 }
 		},
 		"chin": {
 			"chin": { "x": 66.55, "y": 7.32, "rotation": 30.01, "width": 214, "height": 146 }
 		},
 		"head": {
-			"head": { "x": 76.68, "y": 32.21, "rotation": -47.12, "width": 296, "height": 260 }
+			"head": { "x": 76.69, "y": 32.21, "rotation": -47.13, "width": 296, "height": 260 }
 		},
 		"logo": {
 			"logo": { "y": -176.72, "width": 897, "height": 92 }
 		},
 		"tail1": {
-			"tail01": { "x": 22.59, "y": -4.5, "rotation": 163.85, "width": 120, "height": 153 }
+			"tail01": { "x": 22.6, "y": -4.5, "rotation": 163.85, "width": 120, "height": 153 }
 		},
 		"tail2": {
-			"tail02": { "x": 18.11, "y": -1.75, "rotation": 151.84, "width": 95, "height": 120 }
+			"tail02": { "x": 18.12, "y": -1.75, "rotation": 151.85, "width": 95, "height": 120 }
 		},
 		"tail3": {
-			"tail03": { "x": 16.94, "y": -2, "rotation": 150.04, "width": 73, "height": 92 }
+			"tail03": { "x": 16.94, "y": -2.01, "rotation": 150.04, "width": 73, "height": 92 }
 		},
 		"tail4": {
-			"tail04": { "x": 15.34, "y": -2.17, "rotation": 151.84, "width": 56, "height": 71 }
+			"tail04": { "x": 15.35, "y": -2.18, "rotation": 151.85, "width": 56, "height": 71 }
 		},
 		"tail5": {
-			"tail05": { "x": 15.05, "y": -3.57, "rotation": 155, "width": 52, "height": 59 }
+			"tail05": { "x": 15.06, "y": -3.57, "rotation": 155, "width": 52, "height": 59 }
 		},
 		"tail6": {
-			"tail06": { "x": 28.02, "y": -16.83, "rotation": -175.44, "width": 95, "height": 68 }
+			"tail06": { "x": 28.02, "y": -16.83, "rotation": -175.45, "width": 95, "height": 68 }
 		}
 	}
 },
@@ -187,45 +187,45 @@
 			"L_wing": {
 				"attachment": [
 					{ "time": 0, "name": "L_wing01" },
-					{ "time": 0.0666, "name": "L_wing02" },
+					{ "time": 0.0667, "name": "L_wing02" },
 					{ "time": 0.1333, "name": "L_wing03" },
 					{ "time": 0.2, "name": "L_wing04" },
-					{ "time": 0.2666, "name": "L_wing05" },
+					{ "time": 0.2667, "name": "L_wing05" },
 					{ "time": 0.3333, "name": "L_wing06" },
 					{ "time": 0.4, "name": "L_wing07" },
-					{ "time": 0.4666, "name": "L_wing08" },
+					{ "time": 0.4667, "name": "L_wing08" },
 					{ "time": 0.5333, "name": "L_wing09" },
 					{ "time": 0.6, "name": "L_wing01" },
 					{ "time": 0.7333, "name": "L_wing02" },
 					{ "time": 0.8, "name": "L_wing03" },
 					{ "time": 0.8333, "name": "L_wing04" },
-					{ "time": 0.8666, "name": "L_wing05" },
-					{ "time": 0.8999, "name": "L_wing06" },
+					{ "time": 0.8667, "name": "L_wing05" },
+					{ "time": 0.9, "name": "L_wing06" },
 					{ "time": 0.9333, "name": "L_wing07" },
-					{ "time": 0.9666, "name": "L_wing08" },
+					{ "time": 0.9667, "name": "L_wing08" },
 					{ "time": 1, "name": "L_wing01" }
 				]
 			},
 			"R_wing": {
 				"attachment": [
 					{ "time": 0, "name": "R_wing01" },
-					{ "time": 0.0666, "name": "R_wing02" },
+					{ "time": 0.0667, "name": "R_wing02" },
 					{ "time": 0.1333, "name": "R_wing03" },
 					{ "time": 0.2, "name": "R_wing04" },
-					{ "time": 0.2666, "name": "R_wing05" },
+					{ "time": 0.2667, "name": "R_wing05" },
 					{ "time": 0.3333, "name": "R_wing06" },
 					{ "time": 0.4, "name": "R_wing07" },
-					{ "time": 0.4666, "name": "R_wing08" },
+					{ "time": 0.4667, "name": "R_wing08" },
 					{ "time": 0.5333, "name": "R_wing09" },
 					{ "time": 0.6, "name": "R_wing01" },
 					{ "time": 0.7333, "name": "R_wing02" },
-					{ "time": 0.7666, "name": "R_wing02" },
+					{ "time": 0.7667, "name": "R_wing02" },
 					{ "time": 0.8, "name": "R_wing03" },
 					{ "time": 0.8333, "name": "R_wing04" },
-					{ "time": 0.8666, "name": "R_wing05" },
-					{ "time": 0.8999, "name": "R_wing06" },
+					{ "time": 0.8667, "name": "R_wing05" },
+					{ "time": 0.9, "name": "R_wing06" },
 					{ "time": 0.9333, "name": "R_wing07" },
-					{ "time": 0.9666, "name": "R_wing08" },
+					{ "time": 0.9667, "name": "R_wing08" },
 					{ "time": 1, "name": "R_wing01" }
 				]
 			}
@@ -234,9 +234,9 @@
 			"back": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": 17.39 },
+					{ "time": 0.1667, "angle": 17.39 },
 					{ "time": 0.5, "angle": 0 },
-					{ "time": 0.8333, "angle": 7 },
+					{ "time": 0.8333, "angle": 7.01 },
 					{ "time": 1, "angle": 0 }
 				],
 				"translate": [
@@ -253,9 +253,9 @@
 			"neck": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": -8.18 },
+					{ "time": 0.1667, "angle": -8.18 },
 					{ "time": 0.3333, "angle": -23.16 },
-					{ "time": 0.5, "angle": -18.01 },
+					{ "time": 0.5, "angle": -18.02 },
 					{ "time": 1, "angle": 0 }
 				],
 				"translate": [
@@ -289,10 +289,10 @@
 			"tail1": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": -2.42 },
-					{ "time": 0.3333, "angle": -26.2 },
-					{ "time": 0.5, "angle": -29.65 },
-					{ "time": 0.6666, "angle": -23.15 },
+					{ "time": 0.1667, "angle": -2.42 },
+					{ "time": 0.3333, "angle": -26.21 },
+					{ "time": 0.5, "angle": -29.66 },
+					{ "time": 0.6667, "angle": -23.15 },
 					{ "time": 0.8333, "angle": -55.46 },
 					{ "time": 1, "angle": 0 }
 				],
@@ -327,10 +327,10 @@
 			"tail2": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": -1.12 },
+					{ "time": 0.1667, "angle": -1.13 },
 					{ "time": 0.3333, "angle": 10.48 },
 					{ "time": 0.5, "angle": 7.89 },
-					{ "time": 0.8333, "angle": -10.38 },
+					{ "time": 0.8333, "angle": -10.39 },
 					{ "time": 1, "angle": 0 }
 				],
 				"translate": [
@@ -347,10 +347,10 @@
 			"tail3": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": 8.24 },
+					{ "time": 0.1667, "angle": 8.25 },
 					{ "time": 0.3333, "angle": 15.21 },
-					{ "time": 0.5, "angle": 14.84 },
-					{ "time": 0.8333, "angle": -18.9 },
+					{ "time": 0.5, "angle": 14.85 },
+					{ "time": 0.8333, "angle": -18.91 },
 					{ "time": 1, "angle": 0 }
 				],
 				"translate": [
@@ -367,7 +367,7 @@
 			"tail4": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": 17.46 },
+					{ "time": 0.1667, "angle": 17.47 },
 					{ "time": 0.3333, "angle": 22.15 },
 					{ "time": 0.5, "angle": 22.76 },
 					{ "time": 0.8333, "angle": -4.37 },
@@ -387,10 +387,10 @@
 			"tail5": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": 7.4 },
-					{ "time": 0.3333, "angle": 28.5 },
+					{ "time": 0.1667, "angle": 7.4 },
+					{ "time": 0.3333, "angle": 28.51 },
 					{ "time": 0.5, "angle": 21.33 },
-					{ "time": 0.8333, "angle": -1.27 },
+					{ "time": 0.8333, "angle": -1.28 },
 					{ "time": 1, "angle": 0 }
 				],
 				"translate": [
@@ -407,7 +407,7 @@
 			"tail6": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": 45.99 },
+					{ "time": 0.1667, "angle": 46 },
 					{ "time": 0.4, "angle": 43.53 },
 					{ "time": 0.5, "angle": 61.79 },
 					{ "time": 0.8333, "angle": 13.28 },
@@ -427,8 +427,8 @@
 			"R_rear_leg": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": -14.21 },
-					{ "time": 0.5, "angle": 47.17 },
+					{ "time": 0.1667, "angle": -14.22 },
+					{ "time": 0.5, "angle": 47.18 },
 					{ "time": 1, "angle": 0 }
 				],
 				"translate": [
@@ -498,9 +498,9 @@
 					{
 						"time": 0,
 						"angle": 0,
-						"curve": [ 0.408, 1.36, 0.675, 1.43 ]
+						"curve": [ 0.408, 1.37, 0.675, 1.43 ]
 					},
-					{ "time": 0.5, "angle": 1.03 },
+					{ "time": 0.5, "angle": 1.04 },
 					{ "time": 1, "angle": 0 }
 				],
 				"translate": [
@@ -519,11 +519,11 @@
 					{
 						"time": 0,
 						"angle": 0,
-						"curve": [ 0.416, 1.15, 0.494, 1.27 ]
+						"curve": [ 0.417, 1.15, 0.494, 1.28 ]
 					},
 					{ "time": 0.3333, "angle": -5.15 },
-					{ "time": 0.5, "angle": 9.79 },
-					{ "time": 0.6666, "angle": 18.94 },
+					{ "time": 0.5, "angle": 9.8 },
+					{ "time": 0.6667, "angle": 18.95 },
 					{ "time": 1, "angle": 0 }
 				],
 				"translate": [
@@ -540,7 +540,7 @@
 			"L_front_thigh": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": -19.18 },
+					{ "time": 0.1667, "angle": -19.19 },
 					{ "time": 0.3333, "angle": -32.02 },
 					{ "time": 0.5, "angle": -19.62 },
 					{ "time": 1, "angle": 0 }
@@ -559,7 +559,7 @@
 			"R_front_thigh": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": -12.96 },
+					{ "time": 0.1667, "angle": -12.96 },
 					{ "time": 0.5, "angle": 16.2 },
 					{ "time": 1, "angle": 0 }
 				],
@@ -577,7 +577,7 @@
 			"L_front_leg": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": 37.77 },
+					{ "time": 0.1667, "angle": 37.77 },
 					{ "time": 0.5, "angle": 0, "curve": "stepped" },
 					{ "time": 1, "angle": 0 }
 				],
@@ -595,7 +595,7 @@
 			"L_front_toe1": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": -16.08 },
+					{ "time": 0.1667, "angle": -16.09 },
 					{ "time": 0.5, "angle": 0, "curve": "stepped" },
 					{ "time": 1, "angle": 0 }
 				],
@@ -623,14 +623,14 @@
 				],
 				"scale": [
 					{ "time": 0, "x": 1, "y": 1 },
-					{ "time": 0.5, "x": 1.33, "y": 1.029 },
+					{ "time": 0.5, "x": 1.331, "y": 1.029 },
 					{ "time": 1, "x": 1, "y": 1 }
 				]
 			},
 			"L_front_toe4": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.5, "angle": 26.51 },
+					{ "time": 0.5, "angle": 26.52 },
 					{ "time": 1, "angle": 0 }
 				],
 				"translate": [
@@ -640,7 +640,7 @@
 				],
 				"scale": [
 					{ "time": 0, "x": 1, "y": 1 },
-					{ "time": 0.5, "x": 1.21, "y": 0.993 },
+					{ "time": 0.5, "x": 1.211, "y": 0.993 },
 					{ "time": 1, "x": 1, "y": 1 }
 				]
 			},
@@ -657,14 +657,14 @@
 				],
 				"scale": [
 					{ "time": 0, "x": 1, "y": 1 },
-					{ "time": 0.5, "x": 1.354, "y": 1.007 },
+					{ "time": 0.5, "x": 1.355, "y": 1.008 },
 					{ "time": 1, "x": 1, "y": 1 }
 				]
 			},
 			"R_front_leg": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": 26.07 },
+					{ "time": 0.1667, "angle": 26.07 },
 					{ "time": 0.5, "angle": -21.6 },
 					{ "time": 1, "angle": 0 }
 				],
@@ -682,8 +682,8 @@
 			"R_front_toe1": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": 29.23 },
-					{ "time": 0.5, "angle": 34.83 },
+					{ "time": 0.1667, "angle": 29.24 },
+					{ "time": 0.5, "angle": 34.84 },
 					{ "time": 1, "angle": 0 }
 				],
 				"translate": [
@@ -700,7 +700,7 @@
 			"R_front_toe2": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": 24.89 },
+					{ "time": 0.1667, "angle": 24.9 },
 					{ "time": 0.5, "angle": 23.16 },
 					{ "time": 1, "angle": 0 }
 				],
@@ -711,14 +711,14 @@
 				],
 				"scale": [
 					{ "time": 0, "x": 1, "y": 1 },
-					{ "time": 0.5, "x": 1.407, "y": 1.057 },
+					{ "time": 0.5, "x": 1.407, "y": 1.058 },
 					{ "time": 1, "x": 1, "y": 1 }
 				]
 			},
 			"R_front_toe3": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.1666, "angle": 11.01 },
+					{ "time": 0.1667, "angle": 11.01 },
 					{ "time": 0.5, "angle": 0, "curve": "stepped" },
 					{ "time": 1, "angle": 0 }
 				],
@@ -729,15 +729,15 @@
 				],
 				"scale": [
 					{ "time": 0, "x": 1, "y": 1 },
-					{ "time": 0.5, "x": 1.329, "y": 1.181 },
+					{ "time": 0.5, "x": 1.33, "y": 1.182 },
 					{ "time": 1, "x": 1, "y": 1 }
 				]
 			},
 			"L_rear_leg": {
 				"rotate": [
 					{ "time": 0, "angle": 0 },
-					{ "time": 0.3666, "angle": 25.19 },
-					{ "time": 0.6666, "angle": -15.65 },
+					{ "time": 0.3667, "angle": 25.19 },
+					{ "time": 0.6667, "angle": -15.65 },
 					{ "time": 1, "angle": 0 }
 				],
 				"translate": [
@@ -752,13 +752,13 @@
 					{
 						"time": 0,
 						"angle": 0,
-						"curve": [ 0.456, 0.2, 0.422, 1.06 ]
+						"curve": [ 0.457, 0.2, 0.422, 1.07 ]
 					},
 					{ "time": 0.3333, "angle": 23.93 },
 					{
-						"time": 0.6666,
-						"angle": 337.79,
-						"curve": [ 0.41, 0, 0.887, 0.75 ]
+						"time": 0.6667,
+						"angle": 337.8,
+						"curve": [ 0.411, 0, 0.888, 0.75 ]
 					},
 					{ "time": 1, "angle": 0 }
 				],
@@ -767,13 +767,13 @@
 						"time": 0,
 						"x": 0,
 						"y": 0,
-						"curve": [ 0.33, 1, 0.816, 1.33 ]
+						"curve": [ 0.33, 1, 0.816, 1.34 ]
 					},
 					{
 						"time": 0.5,
-						"x": 0,
+						"x": -0.01,
 						"y": 113.01,
-						"curve": [ 0.396, 0, 0.709, 2.03 ]
+						"curve": [ 0.397, 0, 0.71, 2.03 ]
 					},
 					{ "time": 1, "x": 0, "y": 0 }
 				]

+ 19 - 10
spine-unity/Assets/Examples/Spine/Dragon/dragon.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 6bc52290ef03f2846ba38d67e2823598
-timeCreated: 1479419653
+timeCreated: 1487920373
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName:
@@ -25,12 +25,12 @@ TextureImporter:
     21300036: logo
     21300038: tail01
     21300040: tail03
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -42,10 +42,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -56,9 +54,7 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -66,10 +62,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

+ 19 - 10
spine-unity/Assets/Examples/Spine/Dragon/dragon2.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 12c126994123f12468cf4c5a2684078a
-timeCreated: 1479419653
+timeCreated: 1487920372
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName:
@@ -23,12 +23,12 @@ TextureImporter:
     21300032: tail04
     21300034: tail05
     21300036: tail06
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -40,10 +40,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -54,9 +52,7 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -64,10 +60,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

BIN
spine-unity/Assets/Examples/Spine/Dragon/dragon_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/Dragon/dragon_dragon.mat


BIN
spine-unity/Assets/Examples/Spine/Dragon/dragon_dragon2.mat


+ 1 - 1
spine-unity/Assets/Examples/Spine/Eyes/eyes.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "+wD3CxYNDCLBTldmA/MNGhrRDHE", "spine": "3.5.03-beta", "width": 0, "height": 0, "fps": 1, "images": "" },
+"skeleton": { "hash": "zBR2x5RGJoCPEHpszlOxG4dsqEw", "spine": "3.6.07-beta", "width": 868, "height": 322, "fps": 1, "images": "" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "L_Eye", "parent": "root", "x": -223.17, "y": 2.99 },

+ 19 - 10
spine-unity/Assets/Examples/Spine/Eyes/eyes.png.meta

@@ -1,15 +1,15 @@
 fileFormatVersion: 2
 guid: 49441e5a1682e564694545bd9b509785
-timeCreated: 1479419653
+timeCreated: 1487920372
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -21,10 +21,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -35,9 +33,7 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -45,10 +41,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
spine-unity/Assets/Examples/Spine/Eyes/eyes_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/Eyes/eyes_Material.mat


+ 19 - 10
spine-unity/Assets/Examples/Spine/FootSoldier/Equipment/Equipment.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: ddb89f63d0296cf4f8572b0448bb6b30
-timeCreated: 1480096533
+timeCreated: 1487920373
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName:
@@ -8,12 +8,12 @@ TextureImporter:
     21300002: Equipment/shield2
     21300004: Equipment/sword1
     21300006: Equipment/sword4
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -25,10 +25,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -39,9 +37,7 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -49,10 +45,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
   textureType: 0
-  buildTargetSettings: []
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

BIN
spine-unity/Assets/Examples/Spine/FootSoldier/Equipment/Equipment_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/FootSoldier/Equipment/Equipment_Material.mat


+ 19 - 10
spine-unity/Assets/Examples/Spine/FootSoldier/FS_White.png.meta

@@ -1,15 +1,15 @@
 fileFormatVersion: 2
 guid: 57b57f94df266f94ea0981915a4472e1
-timeCreated: 1479419653
+timeCreated: 1487920372
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -21,10 +21,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -35,9 +33,7 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -45,10 +41,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
spine-unity/Assets/Examples/Spine/FootSoldier/FS_White_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/FootSoldier/FS_White_Material.mat


+ 1 - 1
spine-unity/Assets/Examples/Spine/FootSoldier/FootSoldier.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "Zxm0xyXbWEA8jWEYNrsNS6QRSMM", "spine": "3.5.03-beta", "width": 0, "height": 0, "fps": 1, "images": "./images/" },
+"skeleton": { "hash": "ooMXo8M782+fl5yRHjLKoVCXDgk", "spine": "3.6.07-beta", "width": 0, "height": 0, "fps": 1, "images": "./images/" },
 "bones": [
 	{ "name": "Root" },
 	{ "name": "Hip", "parent": "Root", "x": -0.93, "y": 73.4 },

+ 1 - 1
spine-unity/Assets/Examples/Spine/Gauge/Gauge.json

@@ -1,5 +1,5 @@
 {
-"skeleton": { "hash": "l6rgF0e8V0iyd44P62tS+NdEpPk", "spine": "3.5.03-beta", "width": 0, "height": 0, "fps": 1, "images": "./images/" },
+"skeleton": { "hash": "rc2mxcPRae3DQs+8yUQlM2SkaRg", "spine": "3.6.07-beta", "width": 250, "height": 60, "fps": 1, "images": "./images/" },
 "bones": [
 	{ "name": "root" },
 	{ "name": "Bar", "parent": "root", "x": -112.29 }

+ 19 - 10
spine-unity/Assets/Examples/Spine/Gauge/Gauge.png.meta

@@ -1,15 +1,15 @@
 fileFormatVersion: 2
 guid: a11301aad15ed6b4995485a02a81b132
-timeCreated: 1479419654
+timeCreated: 1487920373
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -21,10 +21,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -35,9 +33,7 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -45,10 +41,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
spine-unity/Assets/Examples/Spine/Gauge/Gauge_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/Gauge/Gauge_Material.mat


File diff suppressed because it is too large
+ 212 - 213
spine-unity/Assets/Examples/Spine/Goblins/goblins.json


+ 19 - 10
spine-unity/Assets/Examples/Spine/Goblins/goblins.png.meta

@@ -1,15 +1,15 @@
 fileFormatVersion: 2
 guid: 5fb7efec30c79cb46a705e0d04debb04
-timeCreated: 1479419653
+timeCreated: 1487920372
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -21,10 +21,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -35,9 +33,7 @@ TextureImporter:
     wrapMode: 1
   nPOTScale: 0
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -45,10 +41,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
spine-unity/Assets/Examples/Spine/Goblins/goblins_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/Goblins/goblins_Material.mat


File diff suppressed because it is too large
+ 30 - 37
spine-unity/Assets/Examples/Spine/Hero/hero-mesh.json


+ 20 - 11
spine-unity/Assets/Examples/Spine/Hero/hero-mesh.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 8d970daea81f33648ae2d84ab59c88d4
-timeCreated: 1480046537
+timeCreated: 1487920373
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName:
@@ -24,12 +24,12 @@ TextureImporter:
     21300034: thigh2
     21300036: upperarm1
     21300038: upperarm2
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -41,10 +41,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 1
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -55,20 +53,31 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
-  spriteMode: 2
+  spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

BIN
spine-unity/Assets/Examples/Spine/Hero/hero-mesh_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/Hero/hero-mesh_Material.mat


File diff suppressed because it is too large
+ 24 - 24
spine-unity/Assets/Examples/Spine/Raggedy Spineboy/Raggedy Spineboy.json


+ 19 - 10
spine-unity/Assets/Examples/Spine/Raggedy Spineboy/Raggedy Spineboy.png.meta

@@ -1,15 +1,15 @@
 fileFormatVersion: 2
 guid: b29bbacbc2368c94a9c942d176ac6f59
-timeCreated: 1479419654
+timeCreated: 1487920373
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -21,10 +21,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 1
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -35,9 +33,7 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -45,10 +41,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
spine-unity/Assets/Examples/Spine/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/Raggedy Spineboy/Raggedy Spineboy_Material.mat


File diff suppressed because it is too large
+ 106 - 109
spine-unity/Assets/Examples/Spine/Raptor/raptor.json


+ 19 - 10
spine-unity/Assets/Examples/Spine/Raptor/raptor.png.meta

@@ -1,15 +1,15 @@
 fileFormatVersion: 2
 guid: 4261719a8f729a644b2dab6113d1b0ea
-timeCreated: 1479419653
+timeCreated: 1487920372
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -21,10 +21,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -35,9 +33,7 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -45,10 +41,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
spine-unity/Assets/Examples/Spine/Raptor/raptor_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/Raptor/raptor_Material.mat


+ 317 - 73
spine-unity/Assets/Examples/Spine/Spineboy/spineboy.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "el6mTobqJcoc5sAB6isOC6TBkKg",
-	"spine": "3.5.32",
+	"hash": "plE/WkyO3wvHACP5BGQggZYRRXM",
+	"spine": "3.6.07-beta",
 	"width": 470.71,
 	"height": 731.57,
 	"images": "C:/Program Files (x86)/Spine/examples/spineboy/images/"
@@ -450,6 +450,16 @@
 			}
 		}
 	},
+	"diagonal": {
+		"bones": {
+			"hip": {
+				"rotate": [
+					{ "time": 0, "angle": 42.65 },
+					{ "time": 1.3, "angle": 48.65 }
+				]
+			}
+		}
+	},
 	"frozen": {
 		"slots": {
 			"eye": {
@@ -768,21 +778,21 @@
 			},
 			"muzzle": {
 				"color": [
-					{ "time": 0, "color": "ffffff00", "curve": "stepped" },
-					{ "time": 0.7667, "color": "ffffff00", "curve": "stepped" },
-					{ "time": 0.8, "color": "ffffffff", "curve": "stepped" },
-					{ "time": 0.8333, "color": "ffffff00", "curve": "stepped" },
-					{ "time": 0.8667, "color": "ffffffff", "curve": "stepped" },
-					{ "time": 0.9, "color": "ffffff00", "curve": "stepped" },
-					{ "time": 0.9333, "color": "ffffffff", "curve": "stepped" },
-					{ "time": 0.9667, "color": "ffffff00", "curve": "stepped" },
-					{ "time": 1.1, "color": "ffffffff", "curve": "stepped" },
-					{ "time": 1.1333, "color": "ffffff00", "curve": "stepped" },
-					{ "time": 1.2, "color": "ffffff00", "curve": "stepped" },
-					{ "time": 1.2333, "color": "ffffffff", "curve": "stepped" },
-					{ "time": 1.2667, "color": "ffffff00", "curve": "stepped" },
-					{ "time": 1.3333, "color": "ffffff00", "curve": "stepped" },
-					{ "time": 2.5333, "color": "ffffff00" }
+					{ "time": 0, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.7667, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.8, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.8333, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.8667, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.9, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.9333, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.9667, "color": "0000803f", "curve": "stepped" },
+					{ "time": 1.1, "color": "0000803f", "curve": "stepped" },
+					{ "time": 1.1333, "color": "0000803f", "curve": "stepped" },
+					{ "time": 1.2, "color": "0000803f", "curve": "stepped" },
+					{ "time": 1.2333, "color": "0000803f", "curve": "stepped" },
+					{ "time": 1.2667, "color": "0000803f", "curve": "stepped" },
+					{ "time": 1.3333, "color": "0000803f", "curve": "stepped" },
+					{ "time": 2.5333, "color": "0000803f" }
 				],
 				"attachment": [
 					{ "time": 0, "name": null },
@@ -2070,21 +2080,12 @@
 				"rotate": [
 					{ "time": 0, "angle": 8 },
 					{ "time": 0.2, "angle": -67.54 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1 }
 				]
 			},
 			"front_foot": {
 				"rotate": [
 					{ "time": 0, "angle": 5.4 },
 					{ "time": 0.2, "angle": -16.27 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0 }
-				],
-				"scale": [
-					{ "time": 0, "x": 1, "y": 1 }
 				]
 			},
 			"rear_foot": {
@@ -2257,14 +2258,7 @@
 		"slots": {
 			"front_fist": {
 				"attachment": [
-					{ "time": 0, "name": "front_fist_open" },
-					{ "time": 1.6667, "name": "front_fist_open" }
-				]
-			},
-			"mouth": {
-				"attachment": [
-					{ "time": 0, "name": "mouth_smile" },
-					{ "time": 1.6667, "name": "mouth_smile" }
+					{ "time": 0, "name": "front_fist_open" }
 				]
 			}
 		},
@@ -2332,10 +2326,280 @@
 					{ "time": 0, "angle": 0 },
 					{ "time": 0.6667, "angle": 2.39 },
 					{ "time": 1.6667, "angle": 0 }
+				]
+			},
+			"front_thigh": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 0.65,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -4.34,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "angle": 0.65 }
 				],
 				"translate": [
-					{ "time": 0, "x": -1.89, "y": -4.76, "curve": "stepped" },
-					{ "time": 1.6667, "x": -1.89, "y": -4.76 }
+					{ "time": 0, "x": -13.4, "y": 6.7 }
+				],
+				"scale": [
+					{
+						"time": 0,
+						"x": 0.897,
+						"y": 1,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"x": 0.826,
+						"y": 1,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "x": 0.897, "y": 1 }
+				]
+			},
+			"front_shin": {
+				"rotate": [
+					{ "time": 0, "angle": -19.29 }
+				],
+				"scale": [
+					{
+						"time": 0,
+						"x": 1,
+						"y": 1,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"x": 0.994,
+						"y": 1,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "x": 1, "y": 1 }
+				]
+			},
+			"rear_thigh": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 30.51,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": 40.15,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "angle": 30.51 }
+				]
+			},
+			"rear_shin": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -23.83,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -43.77,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "angle": -23.83 }
+				]
+			},
+			"front_foot": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 5.14,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": 10.05,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "angle": 5.14 }
+				],
+				"scale": [
+					{ "time": 0, "x": 0.755, "y": 1.31 }
+				]
+			},
+			"rear_foot": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -7.34,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": 3.85,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "angle": -7.34 }
+				]
+			},
+			"rear_bracer": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -17.16,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": 12.53,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "angle": -17.16 }
+				]
+			},
+			"head": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -5.51,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -3.12,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "angle": -5.51 }
+				]
+			},
+			"front_bracer": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 45.47,
+						"curve": [ 0.493, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": 41.34,
+						"curve": [ 0.321, 0.11, 0.736, 0.92 ]
+					},
+					{ "time": 1.6667, "angle": 45.47 }
+				]
+			},
+			"gun": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 0,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -15.59,
+						"curve": [ 0.733, 0, 0.77, 0.99 ]
+					},
+					{ "time": 1.6667, "angle": 0 }
+				]
+			},
+			"front_fist": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -6.85,
+						"curve": [ 0.493, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -14.63,
+						"curve": [ 0.324, 0.11, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "angle": -6.85 }
+				],
+				"scale": [
+					{
+						"time": 0,
+						"x": 1,
+						"y": 1,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"x": 0.8,
+						"y": 1.101,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "x": 1, "y": 1 }
+				]
+			},
+			"hip": {
+				"translate": [
+					{
+						"time": 0,
+						"x": -6.64,
+						"y": -23.02,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"x": 6.28,
+						"y": -35.01,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "x": -6.64, "y": -23.02 }
+				]
+			}
+		}
+	},
+	"idlebag": {
+		"slots": {
+			"front_fist": {
+				"attachment": [
+					{ "time": 0, "name": "front_fist_open" }
+				]
+			}
+		},
+		"bones": {
+			"front_upper_arm": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -59.85,
+						"curve": [ 0.493, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -54.32,
+						"curve": [ 0.324, 0.11, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "angle": -59.85 }
+				],
+				"translate": [
+					{ "time": 0, "x": -7.12, "y": -8.24 },
+					{ "time": 0.6667, "x": -6.32, "y": -8.31 },
+					{ "time": 1.6667, "x": -7.12, "y": -8.24 }
+				]
+			},
+			"rear_upper_arm": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 62.42,
+						"curve": [ 0.504, 0.02, 0.75, 1 ]
+					},
+					{
+						"time": 0.7333,
+						"angle": 43.83,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "angle": 62.42 }
+				],
+				"translate": [
+					{ "time": 0, "x": -1.83, "y": -16.79 },
+					{ "time": 0.6667, "x": 0.35, "y": -15.23 },
+					{ "time": 1.6667, "x": -1.83, "y": -16.79 }
 				]
 			},
 			"front_thigh": {
@@ -2353,8 +2617,7 @@
 					{ "time": 1.6667, "angle": 0.65 }
 				],
 				"translate": [
-					{ "time": 0, "x": -13.4, "y": 6.7, "curve": "stepped" },
-					{ "time": 1.6667, "x": -13.4, "y": 6.7 }
+					{ "time": 0, "x": -13.4, "y": 6.7 }
 				],
 				"scale": [
 					{
@@ -2374,8 +2637,7 @@
 			},
 			"front_shin": {
 				"rotate": [
-					{ "time": 0, "angle": -19.29, "curve": "stepped" },
-					{ "time": 1.6667, "angle": -19.29 }
+					{ "time": 0, "angle": -19.29 }
 				],
 				"scale": [
 					{
@@ -2438,8 +2700,7 @@
 					{ "time": 1.6667, "angle": 5.14 }
 				],
 				"scale": [
-					{ "time": 0, "x": 0.755, "y": 1.31, "curve": "stepped" },
-					{ "time": 1.6667, "x": 0.755, "y": 1.31 }
+					{ "time": 0, "x": 0.755, "y": 1.31 }
 				]
 			},
 			"rear_foot": {
@@ -3814,11 +4075,6 @@
 					{ "time": 0.4, "angle": 11.03 },
 					{ "time": 0.6, "angle": 13.59 },
 					{ "time": 0.8, "angle": 11.03 }
-				],
-				"translate": [
-					{ "time": 0, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.4, "x": 0, "y": 0, "curve": "stepped" },
-					{ "time": 0.8, "x": 0, "y": 0 }
 				]
 			},
 			"head": {
@@ -3976,14 +4232,10 @@
 			},
 			"muzzle": {
 				"color": [
-					{
-						"time": 0.0225,
-						"color": "ffffff00",
-						"curve": [ 0.119, 0.99, 0.75, 1 ]
-					},
-					{ "time": 0.0667, "color": "ffffffff", "curve": "stepped" },
-					{ "time": 0.1, "color": "ffffffff" },
-					{ "time": 0.1667, "color": "ffffff00" }
+					{ "time": 0.0225, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.0667, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.1, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.1667, "color": "0000803f" }
 				],
 				"attachment": [
 					{ "time": 0.0333, "name": "muzzle" },
@@ -4084,17 +4336,9 @@
 			},
 			"muzzle": {
 				"color": [
-					{
-						"time": 0.1333,
-						"color": "ffffff00",
-						"curve": [ 0.119, 0.99, 0.75, 1 ]
-					},
-					{
-						"time": 0.1667,
-						"color": "ffffffff",
-						"curve": [ 0.821, 0, 0.91, 0.9 ]
-					},
-					{ "time": 0.2667, "color": "ffffff00" }
+					{ "time": 0.1333, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.1667, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.2667, "color": "0000803f" }
 				],
 				"attachment": [
 					{ "time": 0.1333, "name": "muzzle" },
@@ -4177,21 +4421,21 @@
 		"slots": {
 			"front_foot": {
 				"color": [
-					{ "time": 0.6667, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "ff0700ff" }
+					{ "time": 0.6667, "color": "0000803f", "curve": "stepped" },
+					{ "time": 1.3333, "color": "0000803f" }
 				]
 			},
 			"gun": {
 				"color": [
-					{ "time": 0, "color": "ffffffff", "curve": "stepped" },
-					{ "time": 0.6667, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "32ff00ff" }
+					{ "time": 0, "color": "0000803f", "curve": "stepped" },
+					{ "time": 0.6667, "color": "0000803f" },
+					{ "time": 1.3333, "color": "c9c8483e" }
 				]
 			},
 			"rear_foot": {
 				"color": [
-					{ "time": 0.6667, "color": "ffffffff" },
-					{ "time": 1.3333, "color": "ff0700ff" }
+					{ "time": 0.6667, "color": "0000803f", "curve": "stepped" },
+					{ "time": 1.3333, "color": "0000803f" }
 				]
 			}
 		},

+ 19 - 10
spine-unity/Assets/Examples/Spine/Spineboy/spineboy.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 49bb65eefe08e424bbf7a38bc98ec638
-timeCreated: 1479531454
+timeCreated: 1487920372
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName:
@@ -31,12 +31,12 @@ TextureImporter:
     21300048: rear_thigh
     21300050: rear_upper_arm
     21300052: torso
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -48,10 +48,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 1
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -62,9 +60,7 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -72,10 +68,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

BIN
spine-unity/Assets/Examples/Spine/Spineboy/spineboy_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/Spineboy/spineboy_Material.mat


+ 1 - 1
spine-unity/Assets/Examples/Spine/Spineboy/spineboy_SkeletonData.asset

@@ -18,5 +18,5 @@ MonoBehaviour:
   fromAnimation: []
   toAnimation: []
   duration: []
-  defaultMix: 0.1
+  defaultMix: 0.4
   controller: {fileID: 0}

File diff suppressed because it is too large
+ 62 - 62
spine-unity/Assets/Examples/Spine/Spineunitygirl/Doi.json


+ 19 - 10
spine-unity/Assets/Examples/Spine/Spineunitygirl/Doi.png.meta

@@ -1,15 +1,15 @@
 fileFormatVersion: 2
 guid: 33e128e17951b4a42b17608ff79ba5c5
-timeCreated: 1479419653
+timeCreated: 1487920372
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -21,10 +21,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -35,9 +33,7 @@ TextureImporter:
     wrapMode: 1
   nPOTScale: 0
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -45,10 +41,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
spine-unity/Assets/Examples/Spine/Spineunitygirl/Doi_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/Spineunitygirl/Doi_Material.mat


+ 19 - 10
spine-unity/Assets/Examples/Spine/Strechyman/stretchyman-diffuse-pma.png.meta

@@ -1,15 +1,15 @@
 fileFormatVersion: 2
 guid: 33f10ea7e20549d40a1c23a1adc3f760
-timeCreated: 1479532145
+timeCreated: 1487920372
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -21,10 +21,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
   maxTextureSize: 2048
@@ -35,9 +33,7 @@ TextureImporter:
     wrapMode: 1
   nPOTScale: 0
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -45,10 +41,23 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 5
-  buildTargetSettings: []
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
spine-unity/Assets/Examples/Spine/Strechyman/stretchyman-diffuse-pma_Atlas.asset


BIN
spine-unity/Assets/Examples/Spine/Strechyman/stretchyman-diffuse-pma_Material.mat


File diff suppressed because it is too large
+ 56 - 71
spine-unity/Assets/Examples/Spine/Strechyman/stretchyman.json


Some files were not shown because too many files changed in this diff