Browse Source

Updated samples, added owl.

badlogic 7 years ago
parent
commit
b547280eb9
100 changed files with 2302 additions and 778 deletions
  1. 9 2
      examples/alien/export/alien-ess.json
  2. BIN
      examples/alien/export/alien-ess.skel
  3. 10 3
      examples/alien/export/alien-pro.json
  4. BIN
      examples/alien/export/alien-pro.skel
  5. 8 1
      examples/coin/export/coin-pro.json
  6. BIN
      examples/coin/export/coin-pro.skel
  7. 8 1
      examples/dragon/export/dragon-ess.json
  8. BIN
      examples/dragon/export/dragon-ess.skel
  9. 7 1
      examples/export/export.sh
  10. 16 0
      examples/export/runtimes.sh
  11. 8 1
      examples/goblins/export/goblins-ess.json
  12. BIN
      examples/goblins/export/goblins-ess.skel
  13. 9 2
      examples/goblins/export/goblins-pro.json
  14. BIN
      examples/goblins/export/goblins-pro.skel
  15. 8 1
      examples/hero/export/hero-ess.json
  16. BIN
      examples/hero/export/hero-ess.skel
  17. 9 2
      examples/hero/export/hero-pro.json
  18. BIN
      examples/hero/export/hero-pro.skel
  19. 195 0
      examples/owl/export/owl-pma.atlas
  20. BIN
      examples/owl/export/owl-pma.png
  21. 318 0
      examples/owl/export/owl-pro.json
  22. BIN
      examples/owl/export/owl-pro.skel
  23. 195 0
      examples/owl/export/owl.atlas
  24. BIN
      examples/owl/export/owl.png
  25. BIN
      examples/owl/images/L_eye-closed.png
  26. BIN
      examples/owl/images/L_eye-iris.png
  27. BIN
      examples/owl/images/L_eye-light.png
  28. BIN
      examples/owl/images/L_eye-pupil.png
  29. BIN
      examples/owl/images/L_foot.png
  30. BIN
      examples/owl/images/L_wing.png
  31. BIN
      examples/owl/images/R_eye-closed.png
  32. BIN
      examples/owl/images/R_eye-iris.png
  33. BIN
      examples/owl/images/R_eye-light.png
  34. BIN
      examples/owl/images/R_eye-pupil.png
  35. BIN
      examples/owl/images/R_foot.png
  36. BIN
      examples/owl/images/R_wing.png
  37. BIN
      examples/owl/images/beak-down.png
  38. BIN
      examples/owl/images/beak.png
  39. BIN
      examples/owl/images/body.png
  40. BIN
      examples/owl/images/feather-1.png
  41. BIN
      examples/owl/images/feather-2.png
  42. BIN
      examples/owl/images/feather-3.png
  43. BIN
      examples/owl/images/head-base.png
  44. BIN
      examples/owl/images/leaf-1.png
  45. BIN
      examples/owl/images/leaf-2.png
  46. BIN
      examples/owl/images/leaf-3.png
  47. BIN
      examples/owl/images/leaf-4.png
  48. BIN
      examples/owl/images/leaf-5.png
  49. BIN
      examples/owl/images/leaf-6.png
  50. BIN
      examples/owl/images/leaf-7.png
  51. BIN
      examples/owl/images/wood.png
  52. 8 0
      examples/owl/license.txt
  53. BIN
      examples/owl/owl-pro.spine
  54. 21 14
      examples/powerup/export/powerup-ess.json
  55. BIN
      examples/powerup/export/powerup-ess.skel
  56. 9 2
      examples/powerup/export/powerup-pro.json
  57. BIN
      examples/powerup/export/powerup-pro.skel
  58. 9 2
      examples/raptor/export/raptor-pro.json
  59. BIN
      examples/raptor/export/raptor-pro.skel
  60. 8 1
      examples/speedy/export/speedy-ess.json
  61. BIN
      examples/speedy/export/speedy-ess.skel
  62. 10 3
      examples/spineboy/export/spineboy-ess.json
  63. BIN
      examples/spineboy/export/spineboy-ess.skel
  64. 10 3
      examples/spineboy/export/spineboy-pro.json
  65. BIN
      examples/spineboy/export/spineboy-pro.skel
  66. 20 13
      examples/spinosaurus/export/spinosaurus-ess.json
  67. BIN
      examples/spinosaurus/export/spinosaurus-ess.skel
  68. 10 3
      examples/stretchyman/export/stretchyman-pro.json
  69. BIN
      examples/stretchyman/export/stretchyman-pro.skel
  70. 178 171
      examples/tank/export/tank-pro.json
  71. BIN
      examples/tank/export/tank-pro.skel
  72. 9 2
      examples/vine/export/vine-pro.json
  73. BIN
      examples/vine/export/vine-pro.skel
  74. 10 3
      spine-as3/spine-as3-example/src/spineboy-ess.json
  75. 8 1
      spine-cocos2d-objc/Resources/coin-pro.json
  76. 9 2
      spine-cocos2d-objc/Resources/goblins-pro.json
  77. 9 2
      spine-cocos2d-objc/Resources/raptor-pro.json
  78. 10 3
      spine-cocos2d-objc/Resources/spineboy-ess.json
  79. 178 171
      spine-cocos2d-objc/Resources/tank-pro.json
  80. 8 1
      spine-cocos2dx/example/Resources/common/coin-pro.json
  81. 9 2
      spine-cocos2dx/example/Resources/common/goblins-pro.json
  82. 9 2
      spine-cocos2dx/example/Resources/common/raptor-pro.json
  83. 10 3
      spine-cocos2dx/example/Resources/common/spineboy-ess.json
  84. 178 171
      spine-cocos2dx/example/Resources/common/tank-pro.json
  85. 8 1
      spine-corona/data/coin-pro.json
  86. 9 2
      spine-corona/data/goblins-pro.json
  87. 318 0
      spine-corona/data/owl-pro.json
  88. 195 0
      spine-corona/data/owl.atlas
  89. BIN
      spine-corona/data/owl.png
  90. 9 2
      spine-corona/data/raptor-pro.json
  91. 10 3
      spine-corona/data/spineboy-ess.json
  92. 10 3
      spine-corona/data/stretchyman-pro.json
  93. 178 171
      spine-corona/data/tank-pro.json
  94. 9 2
      spine-corona/data/vine-pro.json
  95. 8 1
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.json
  96. BIN
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.skel
  97. 9 2
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.json
  98. BIN
      spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.skel
  99. 9 2
      spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.json
  100. BIN
      spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.skel

+ 9 - 2
examples/alien/export/alien-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "opir+OM2Pc8jor3YUJ3TGCWEXQY", "spine": "3.6.32", "width": 365.79, "height": 391.51, "images": "./images/" },
+"skeleton": {
+	"hash": "1WH+BPDx5fIR5Td0X/LQY1L6yi8",
+	"spine": "3.7.08-beta",
+	"width": 365.79,
+	"height": 391.51,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": -8.17, "y": 73.5, "color": "fff200ff" },
@@ -159,7 +166,7 @@
 			},
 			"splat01": {
 				"color": [
-					{ "time": 1.5667, "color": "fffffffe" },
+					{ "time": 1.5667, "color": "ffffffff" },
 					{
 						"time": 1.7333,
 						"color": "ffffffba",

BIN
examples/alien/export/alien-ess.skel


File diff suppressed because it is too large
+ 10 - 3
examples/alien/export/alien-pro.json


BIN
examples/alien/export/alien-pro.skel


+ 8 - 1
examples/coin/export/coin-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "4cI0KYdFTZbO7vkQYPFQN+yauDw", "spine": "3.6.32", "width": 260, "height": 359.92, "images": "./images/" },
+"skeleton": {
+	"hash": "lfmnIwRt8cjfHaBQWvT0v4odYdY",
+	"spine": "3.7.08-beta",
+	"width": 260,
+	"height": 359.92,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "coin-root", "parent": "root", "y": 300, "color": "ff0000ff" },

BIN
examples/coin/export/coin-pro.skel


+ 8 - 1
examples/dragon/export/dragon-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "fU1LyLo9U9jF7UZJrm+dkPTXbAY", "spine": "3.6.32", "width": 660.39, "height": 604.09, "images": "./images/" },
+"skeleton": {
+	"hash": "lv0LmUZo/75fufw/LnAEx8+6j2Y",
+	"spine": "3.7.08-beta",
+	"width": 660.39,
+	"height": 604.09,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root", "y": -176.12 },
 	{ "name": "center", "parent": "root", "y": 176.12, "color": "ffe300ff" },

BIN
examples/dragon/export/dragon-ess.skel


+ 7 - 1
examples/export/export.sh

@@ -23,6 +23,7 @@ rm -rf ../stretchyman/export/*
 rm -rf ../raptor/export/*
 rm -rf ../tank/export/*
 rm -rf ../vine/export/*
+rm -rf ../owl/export/*
 
 echo ""
 echo "Exporting..."
@@ -98,4 +99,9 @@ echo "Exporting..."
 -i ../vine/vine-pro.spine -o ../vine/export -e json.json \
 -i ../vine/vine-pro.spine -o ../vine/export -e binary.json \
 -i ../vine/images -o ../vine/export -n vine -p atlas-1.0.json \
--i ../vine/images -o ../vine/export -n vine-pma -p atlas-1.0-pma.json
+-i ../vine/images -o ../vine/export -n vine-pma -p atlas-1.0-pma.json \
+\
+-i ../owl/owl-pro.spine -o ../owl/export -e json.json \
+-i ../owl/owl-pro.spine -o ../owl/export -e binary.json \
+-i ../owl/images -o ../owl/export -n owl -p atlas-0.5.json \
+-i ../owl/images -o ../owl/export -n owl-pma -p atlas-0.5-pma.json

+ 16 - 0
examples/export/runtimes.sh

@@ -101,6 +101,10 @@ cp -f ../stretchyman/export/stretchyman-pro.json ../../spine-corona/data
 cp -f ../stretchyman/export/stretchyman.atlas ../../spine-corona/data
 cp -f ../stretchyman/export/stretchyman.png ../../spine-corona/data
 
+cp -f ../owl/export/owl-pro.json ../../spine-corona/data
+cp -f ../owl/export/owl.atlas ../../spine-corona/data
+cp -f ../owl/export/owl.png ../../spine-corona/data
+
 echo "spine-love"
 rm -f ../../spine-love/data/*
 cp -f ../coin/export/coin-pro.json ../../spine-love/data
@@ -168,6 +172,11 @@ cp -f ../stretchyman/export/stretchyman-pro.skel ../../spine-sfml/data/
 cp -f ../stretchyman/export/stretchyman.atlas ../../spine-sfml/data/
 cp -f ../stretchyman/export/stretchyman.png ../../spine-sfml/data/
 
+cp -f ../owl/export/owl-pro.json ../../spine-sfml/data/
+cp -f ../owl/export/owl-pro.skel ../../spine-sfml/data/
+cp -f ../owl/export/owl.atlas ../../spine-sfml/data/
+cp -f ../owl/export/owl.png ../../spine-sfml/data/
+
 echo "spine-starling"
 # DO NOT DELETE EVERYTHING IN SOURCE, ESPECIALLY goblins-mesh-starling.png/.xml
 cp -f ../coin/export/coin-pro.json ../../spine-starling/spine-starling-example/src/
@@ -198,6 +207,9 @@ cp -f ../stretchyman/export/stretchyman-pro.json ../../spine-starling/spine-star
 cp -f ../stretchyman/export/stretchyman.atlas ../../spine-starling/spine-starling-example/src/
 cp -f ../stretchyman/export/stretchyman.png ../../spine-starling/spine-starling-example/src/
 
+cp -f ../owl/export/owl-pro.json ../../spine-starling/spine-starling-example/src/
+cp -f ../owl/export/owl.atlas ../../spine-starling/spine-starling-example/src/
+cp -f ../owl/export/owl.png ../../spine-starling/spine-starling-example/src/
 
 echo "spine-ts"
 rm -f ../../spine-ts/webgl/example/assets/*
@@ -226,6 +238,10 @@ cp -f ../vine/export/vine-pro.json ../../spine-ts/webgl/example/assets/
 cp -f ../vine/export/vine.atlas ../../spine-ts/webgl/example/assets/
 cp -f ../vine/export/vine.png ../../spine-ts/webgl/example/assets/
 
+cp -f ../owl/export/owl-pro.json ../../spine-ts/webgl/example/assets/
+cp -f ../owl/export/owl.atlas ../../spine-ts/webgl/example/assets/
+cp -f ../owl/export/owl.png ../../spine-ts/webgl/example/assets/
+
 cp -f ../stretchyman/export/stretchyman-pro.json ../../spine-ts/webgl/example/assets/
 cp -f ../stretchyman/export/stretchyman.atlas ../../spine-ts/webgl/example/assets/
 cp -f ../stretchyman/export/stretchyman.png ../../spine-ts/webgl/example/assets/

+ 8 - 1
examples/goblins/export/goblins-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "V6g6Wb9jzPmhtOSXWRntImZ1WtU", "spine": "3.6.32", "width": 234.03, "height": 354.91, "images": "./images/" },
+"skeleton": {
+	"hash": "2ZytXk25WMQh7xfYd6gBJKXviEA",
+	"spine": "3.7.08-beta",
+	"width": 234.03,
+	"height": 354.91,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41, "color": "ffd300ff" },

BIN
examples/goblins/export/goblins-ess.skel


+ 9 - 2
examples/goblins/export/goblins-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "zpNuAPL6j4bcbent5j8BOpZlfdA", "spine": "3.6.32", "width": 266.94, "height": 349.61, "images": "./images/" },
+"skeleton": {
+	"hash": "GEt0/K+46aqD75ngNEZOztV899k",
+	"spine": "3.7.08-beta",
+	"width": 266.94,
+	"height": 349.61,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41, "color": "ffcf00ff" },
@@ -87,7 +94,7 @@
 			"spear": {
 				"type": "mesh",
 				"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
-				"triangles": [ 5, 6, 4, 6, 7, 4, 4, 7, 3, 2, 9, 1, 9, 10, 1, 10, 12, 1, 12, 13, 1, 1, 13, 0, 10, 11, 12, 3, 8, 2, 8, 9, 2, 7, 8, 3 ],
+				"triangles": [ 4, 7, 3, 6, 7, 4, 5, 6, 4, 10, 11, 12, 1, 13, 0, 12, 13, 1, 10, 12, 1, 9, 10, 1, 2, 9, 1, 8, 9, 2, 3, 8, 2, 7, 8, 3 ],
 				"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
 				"hull": 14,
 				"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],

BIN
examples/goblins/export/goblins-pro.skel


+ 8 - 1
examples/hero/export/hero-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "NAbiOKbM7FyNIariZO+NdrVTLNM", "spine": "3.6.32", "width": 319.3, "height": 337, "images": "./images/" },
+"skeleton": {
+	"hash": "Wq8GctlBtla8pdLAXAZM0XauZSA",
+	"spine": "3.7.08-beta",
+	"width": 319.3,
+	"height": 337,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "y": 94.89 },

BIN
examples/hero/export/hero-ess.skel


File diff suppressed because it is too large
+ 9 - 2
examples/hero/export/hero-pro.json


BIN
examples/hero/export/hero-pro.skel


+ 195 - 0
examples/owl/export/owl-pma.atlas

@@ -0,0 +1,195 @@
+
+owl-pma.png
+size: 1024,512
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+L_eye-closed
+  rotate: false
+  xy: 508, 115
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+L_eye-iris
+  rotate: false
+  xy: 826, 183
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+L_eye-light
+  rotate: false
+  xy: 1001, 488
+  size: 21, 20
+  orig: 21, 20
+  offset: 0, 0
+  index: -1
+L_eye-pupil
+  rotate: false
+  xy: 752, 154
+  size: 63, 60
+  orig: 63, 60
+  offset: 0, 0
+  index: -1
+L_foot
+  rotate: false
+  xy: 817, 133
+  size: 64, 48
+  orig: 64, 48
+  offset: 0, 0
+  index: -1
+L_wing
+  rotate: false
+  xy: 342, 91
+  size: 81, 110
+  orig: 81, 110
+  offset: 0, 0
+  index: -1
+R_eye-closed
+  rotate: false
+  xy: 508, 27
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+R_eye-iris
+  rotate: true
+  xy: 600, 111
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+R_eye-light
+  rotate: false
+  xy: 1001, 466
+  size: 21, 20
+  orig: 21, 20
+  offset: 0, 0
+  index: -1
+R_eye-pupil
+  rotate: true
+  xy: 691, 72
+  size: 63, 60
+  orig: 63, 60
+  offset: 0, 0
+  index: -1
+R_foot
+  rotate: false
+  xy: 814, 83
+  size: 64, 48
+  orig: 64, 48
+  offset: 0, 0
+  index: -1
+R_wing
+  rotate: false
+  xy: 425, 91
+  size: 81, 110
+  orig: 81, 110
+  offset: 0, 0
+  index: -1
+beak
+  rotate: false
+  xy: 883, 140
+  size: 39, 41
+  orig: 39, 41
+  offset: 0, 0
+  index: -1
+beak-down
+  rotate: true
+  xy: 753, 53
+  size: 37, 40
+  orig: 37, 40
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 2, 5
+  size: 248, 196
+  orig: 248, 196
+  offset: 0, 0
+  index: -1
+feather-1
+  rotate: false
+  xy: 753, 92
+  size: 59, 60
+  orig: 59, 60
+  offset: 0, 0
+  index: -1
+feather-2
+  rotate: false
+  xy: 688, 137
+  size: 62, 65
+  orig: 62, 65
+  offset: 0, 0
+  index: -1
+feather-3
+  rotate: true
+  xy: 600, 2
+  size: 56, 76
+  orig: 56, 76
+  offset: 0, 0
+  index: -1
+head-base
+  rotate: false
+  xy: 621, 271
+  size: 299, 237
+  orig: 299, 237
+  offset: 0, 0
+  index: -1
+leaf-1
+  rotate: false
+  xy: 922, 273
+  size: 76, 101
+  orig: 76, 101
+  offset: 0, 0
+  index: -1
+leaf-2
+  rotate: true
+  xy: 621, 204
+  size: 65, 95
+  orig: 65, 95
+  offset: 0, 0
+  index: -1
+leaf-3
+  rotate: true
+  xy: 922, 376
+  size: 132, 77
+  orig: 132, 77
+  offset: 0, 0
+  index: -1
+leaf-4
+  rotate: false
+  xy: 600, 60
+  size: 89, 49
+  orig: 89, 49
+  offset: 0, 0
+  index: -1
+leaf-5
+  rotate: true
+  xy: 718, 216
+  size: 53, 106
+  orig: 53, 106
+  offset: 0, 0
+  index: -1
+leaf-6
+  rotate: false
+  xy: 252, 85
+  size: 88, 116
+  orig: 88, 116
+  offset: 0, 0
+  index: -1
+leaf-7
+  rotate: true
+  xy: 252, 29
+  size: 54, 86
+  orig: 54, 86
+  offset: 0, 0
+  index: -1
+wood
+  rotate: false
+  xy: 2, 203
+  size: 617, 305
+  orig: 617, 305
+  offset: 0, 0
+  index: -1

BIN
examples/owl/export/owl-pma.png


File diff suppressed because it is too large
+ 318 - 0
examples/owl/export/owl-pro.json


BIN
examples/owl/export/owl-pro.skel


+ 195 - 0
examples/owl/export/owl.atlas

@@ -0,0 +1,195 @@
+
+owl.png
+size: 1024,512
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+L_eye-closed
+  rotate: false
+  xy: 508, 115
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+L_eye-iris
+  rotate: false
+  xy: 826, 183
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+L_eye-light
+  rotate: false
+  xy: 1001, 488
+  size: 21, 20
+  orig: 21, 20
+  offset: 0, 0
+  index: -1
+L_eye-pupil
+  rotate: false
+  xy: 752, 154
+  size: 63, 60
+  orig: 63, 60
+  offset: 0, 0
+  index: -1
+L_foot
+  rotate: false
+  xy: 817, 133
+  size: 64, 48
+  orig: 64, 48
+  offset: 0, 0
+  index: -1
+L_wing
+  rotate: false
+  xy: 342, 91
+  size: 81, 110
+  orig: 81, 110
+  offset: 0, 0
+  index: -1
+R_eye-closed
+  rotate: false
+  xy: 508, 27
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+R_eye-iris
+  rotate: true
+  xy: 600, 111
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+R_eye-light
+  rotate: false
+  xy: 1001, 466
+  size: 21, 20
+  orig: 21, 20
+  offset: 0, 0
+  index: -1
+R_eye-pupil
+  rotate: true
+  xy: 691, 72
+  size: 63, 60
+  orig: 63, 60
+  offset: 0, 0
+  index: -1
+R_foot
+  rotate: false
+  xy: 814, 83
+  size: 64, 48
+  orig: 64, 48
+  offset: 0, 0
+  index: -1
+R_wing
+  rotate: false
+  xy: 425, 91
+  size: 81, 110
+  orig: 81, 110
+  offset: 0, 0
+  index: -1
+beak
+  rotate: false
+  xy: 883, 140
+  size: 39, 41
+  orig: 39, 41
+  offset: 0, 0
+  index: -1
+beak-down
+  rotate: true
+  xy: 753, 53
+  size: 37, 40
+  orig: 37, 40
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 2, 5
+  size: 248, 196
+  orig: 248, 196
+  offset: 0, 0
+  index: -1
+feather-1
+  rotate: false
+  xy: 753, 92
+  size: 59, 60
+  orig: 59, 60
+  offset: 0, 0
+  index: -1
+feather-2
+  rotate: false
+  xy: 688, 137
+  size: 62, 65
+  orig: 62, 65
+  offset: 0, 0
+  index: -1
+feather-3
+  rotate: true
+  xy: 600, 2
+  size: 56, 76
+  orig: 56, 76
+  offset: 0, 0
+  index: -1
+head-base
+  rotate: false
+  xy: 621, 271
+  size: 299, 237
+  orig: 299, 237
+  offset: 0, 0
+  index: -1
+leaf-1
+  rotate: false
+  xy: 922, 273
+  size: 76, 101
+  orig: 76, 101
+  offset: 0, 0
+  index: -1
+leaf-2
+  rotate: true
+  xy: 621, 204
+  size: 65, 95
+  orig: 65, 95
+  offset: 0, 0
+  index: -1
+leaf-3
+  rotate: true
+  xy: 922, 376
+  size: 132, 77
+  orig: 132, 77
+  offset: 0, 0
+  index: -1
+leaf-4
+  rotate: false
+  xy: 600, 60
+  size: 89, 49
+  orig: 89, 49
+  offset: 0, 0
+  index: -1
+leaf-5
+  rotate: true
+  xy: 718, 216
+  size: 53, 106
+  orig: 53, 106
+  offset: 0, 0
+  index: -1
+leaf-6
+  rotate: false
+  xy: 252, 85
+  size: 88, 116
+  orig: 88, 116
+  offset: 0, 0
+  index: -1
+leaf-7
+  rotate: true
+  xy: 252, 29
+  size: 54, 86
+  orig: 54, 86
+  offset: 0, 0
+  index: -1
+wood
+  rotate: false
+  xy: 2, 203
+  size: 617, 305
+  orig: 617, 305
+  offset: 0, 0
+  index: -1

BIN
examples/owl/export/owl.png


BIN
examples/owl/images/L_eye-closed.png


BIN
examples/owl/images/L_eye-iris.png


BIN
examples/owl/images/L_eye-light.png


BIN
examples/owl/images/L_eye-pupil.png


BIN
examples/owl/images/L_foot.png


BIN
examples/owl/images/L_wing.png


BIN
examples/owl/images/R_eye-closed.png


BIN
examples/owl/images/R_eye-iris.png


BIN
examples/owl/images/R_eye-light.png


BIN
examples/owl/images/R_eye-pupil.png


BIN
examples/owl/images/R_foot.png


BIN
examples/owl/images/R_wing.png


BIN
examples/owl/images/beak-down.png


BIN
examples/owl/images/beak.png


BIN
examples/owl/images/body.png


BIN
examples/owl/images/feather-1.png


BIN
examples/owl/images/feather-2.png


BIN
examples/owl/images/feather-3.png


BIN
examples/owl/images/head-base.png


BIN
examples/owl/images/leaf-1.png


BIN
examples/owl/images/leaf-2.png


BIN
examples/owl/images/leaf-3.png


BIN
examples/owl/images/leaf-4.png


BIN
examples/owl/images/leaf-5.png


BIN
examples/owl/images/leaf-6.png


BIN
examples/owl/images/leaf-7.png


BIN
examples/owl/images/wood.png


+ 8 - 0
examples/owl/license.txt

@@ -0,0 +1,8 @@
+Copyright (c) 2016, Esoteric Software
+
+The images in this project may be redistributed as long as they are accompanied
+by this license file. The images may not be used for commercial use of any
+kind.
+
+The project file is released into the public domain. It may be used as the basis
+for derivative work.

BIN
examples/owl/owl-pro.spine


+ 21 - 14
examples/powerup/export/powerup-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "qtdMbfyfM7P3Xcdgi8mPIeMaIjk", "spine": "3.6.32", "width": 413.19, "height": 195.71, "images": "./images/" },
+"skeleton": {
+	"hash": "VkGIE6Vi5G7QHYZfaGNNFIUZbQ4",
+	"spine": "3.7.08-beta",
+	"width": 413.19,
+	"height": 195.71,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "powerup", "parent": "root", "x": 1.48, "y": 134.02 },
@@ -83,42 +90,42 @@
 			"star": {
 				"color": [
 					{ "time": 0, "color": "ffffff00" },
-					{ "time": 0.5667, "color": "fffffffe" },
+					{ "time": 0.5667, "color": "ffffffff" },
 					{ "time": 0.7, "color": "ffffff00" }
 				]
 			},
 			"star1": {
 				"color": [
 					{ "time": 0.2667, "color": "fff9f600" },
-					{ "time": 0.8333, "color": "fffffffe" },
+					{ "time": 0.8333, "color": "ffffffff" },
 					{ "time": 0.9667, "color": "fff0f200" }
 				]
 			},
 			"star2": {
 				"color": [
 					{ "time": 0.1333, "color": "ffffff00" },
-					{ "time": 0.7, "color": "fffffffe" },
+					{ "time": 0.7, "color": "ffffffff" },
 					{ "time": 0.8333, "color": "ffffff00" }
 				]
 			},
 			"star3": {
 				"color": [
 					{ "time": 0.4333, "color": "ffffff00" },
-					{ "time": 1, "color": "fffffffe" },
+					{ "time": 1, "color": "ffffffff" },
 					{ "time": 1.1333, "color": "ffffff00" }
 				]
 			},
 			"star4": {
 				"color": [
 					{ "time": 0.6333, "color": "ffffff00" },
-					{ "time": 1.2, "color": "fffffffe" },
+					{ "time": 1.2, "color": "ffffffff" },
 					{ "time": 1.3333, "color": "ffffff00" }
 				]
 			},
 			"star5": {
 				"color": [
 					{ "time": 0, "color": "ffffff9e" },
-					{ "time": 0.2333, "color": "fffffffe" },
+					{ "time": 0.2333, "color": "ffffffff" },
 					{ "time": 0.3667, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 1.0667, "color": "ffffff00" },
 					{ "time": 1.4, "color": "ffffff9e" }
@@ -126,24 +133,24 @@
 			},
 			"star6": {
 				"color": [
-					{ "time": 0, "color": "fffffffe", "curve": "stepped" },
-					{ "time": 0.2667, "color": "fffffffe" },
+					{ "time": 0, "color": "ffffffff", "curve": "stepped" },
+					{ "time": 0.2667, "color": "ffffffff" },
 					{ "time": 0.4333, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 1.3, "color": "ffffff00" },
-					{ "time": 1.4, "color": "fffffffe" }
+					{ "time": 1.4, "color": "ffffffff" }
 				]
 			},
 			"star7": {
 				"color": [
 					{ "time": 0.6667, "color": "ffffff00" },
-					{ "time": 1.2333, "color": "fffffffe" },
+					{ "time": 1.2333, "color": "ffffffff" },
 					{ "time": 1.3667, "color": "ffffff00" }
 				]
 			},
 			"star8": {
 				"color": [
 					{ "time": 0, "color": "ffffffbe" },
-					{ "time": 0.1333, "color": "fffffffe" },
+					{ "time": 0.1333, "color": "ffffffff" },
 					{ "time": 0.2667, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.9667, "color": "ffffff00" },
 					{ "time": 1.4, "color": "ffffffbe" }
@@ -151,10 +158,10 @@
 			},
 			"star9": {
 				"color": [
-					{ "time": 0, "color": "fffffffe" },
+					{ "time": 0, "color": "ffffffff" },
 					{ "time": 0.1333, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.8333, "color": "ffffff00" },
-					{ "time": 1.4, "color": "fffffffe" }
+					{ "time": 1.4, "color": "ffffffff" }
 				]
 			}
 		},

BIN
examples/powerup/export/powerup-ess.skel


File diff suppressed because it is too large
+ 9 - 2
examples/powerup/export/powerup-pro.json


BIN
examples/powerup/export/powerup-pro.skel


File diff suppressed because it is too large
+ 9 - 2
examples/raptor/export/raptor-pro.json


BIN
examples/raptor/export/raptor-pro.skel


+ 8 - 1
examples/speedy/export/speedy-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "++mhVwX8YdvkuwbhyKGjdWVylW8", "spine": "3.6.32", "width": 196.03, "height": 305.44, "images": "./images/" },
+"skeleton": {
+	"hash": "0WWsTwNMw5sqmCBGEaQWE7dbV4g",
+	"spine": "3.7.08-beta",
+	"width": 196.03,
+	"height": 305.44,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": -0.03, "y": 51.91 },

BIN
examples/speedy/export/speedy-ess.skel


+ 10 - 3
examples/spineboy/export/spineboy-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "K7oDNcMxrFpZQBcQZLCdAEjLad8", "spine": "3.6.32", "width": 470.72, "height": 731.57, "images": "./images/" },
+"skeleton": {
+	"hash": "0DoQUqP6ATLL322RHY3r98lgFr8",
+	"spine": "3.7.08-beta",
+	"width": 470.72,
+	"height": 731.57,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "dust", "parent": "root", "x": -303.6, "y": 32.64, "scaleX": 1.457 },
@@ -1095,10 +1102,10 @@
 					{ "time": 0, "color": "ffffff1e" },
 					{ "time": 0.0333, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.1667, "color": "ffffff00" },
-					{ "time": 0.2, "color": "fffffffe" },
+					{ "time": 0.2, "color": "ffffffff" },
 					{ "time": 0.4667, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.5333, "color": "ffffff00" },
-					{ "time": 0.5667, "color": "fffffffe" },
+					{ "time": 0.5667, "color": "ffffffff" },
 					{ "time": 0.8, "color": "ffffff1e" }
 				],
 				"attachment": [

BIN
examples/spineboy/export/spineboy-ess.skel


File diff suppressed because it is too large
+ 10 - 3
examples/spineboy/export/spineboy-pro.json


BIN
examples/spineboy/export/spineboy-pro.skel


+ 20 - 13
examples/spinosaurus/export/spinosaurus-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "NNJVtxggGcRYx+90DxeKZu5oQ68", "spine": "3.6.32", "width": 1680, "height": 1782.28, "images": "./images/" },
+"skeleton": {
+	"hash": "B2ZPp7lIxBrN+g+ALWuTw4IWKYE",
+	"spine": "3.7.08-beta",
+	"width": 1680,
+	"height": 1782.28,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root", "y": -526.32 },
 	{ "name": "leaves", "parent": "root", "x": -0.17, "y": 1310.1 },
@@ -41,35 +48,35 @@
 			"leaves": {
 				"color": [
 					{ "time": 0, "color": "ffffff00" },
-					{ "time": 0.3333, "color": "fffffffe" }
+					{ "time": 0.3333, "color": "ffffffff" }
 				]
 			},
 			"logo": {
 				"color": [
 					{ "time": 0, "color": "ffffff00" },
-					{ "time": 0.3333, "color": "fffffffe" }
+					{ "time": 0.3333, "color": "ffffffff" }
 				]
 			},
 			"play": {
 				"color": [
-					{ "time": 1.3333, "color": "fff99dfe" },
-					{ "time": 1.5667, "color": "fffffffe", "curve": "stepped" },
-					{ "time": 1.8333, "color": "fffffffe" },
-					{ "time": 2.0667, "color": "fff99dfe" }
+					{ "time": 1.3333, "color": "fff99dff" },
+					{ "time": 1.5667, "color": "ffffffff", "curve": "stepped" },
+					{ "time": 1.8333, "color": "ffffffff" },
+					{ "time": 2.0667, "color": "fff99dff" }
 				]
 			},
 			"quit": {
 				"color": [
-					{ "time": 2.4, "color": "fff99dfe" },
-					{ "time": 2.6333, "color": "fffffffe" }
+					{ "time": 2.4, "color": "fff99dff" },
+					{ "time": 2.6333, "color": "ffffffff" }
 				]
 			},
 			"settings": {
 				"color": [
-					{ "time": 1.8667, "color": "fff99dfe" },
-					{ "time": 2.1, "color": "fffffffe", "curve": "stepped" },
-					{ "time": 2.3667, "color": "fffffffe" },
-					{ "time": 2.6, "color": "fff99dfe" }
+					{ "time": 1.8667, "color": "fff99dff" },
+					{ "time": 2.1, "color": "ffffffff", "curve": "stepped" },
+					{ "time": 2.3667, "color": "ffffffff" },
+					{ "time": 2.6, "color": "fff99dff" }
 				]
 			}
 		},

BIN
examples/spinosaurus/export/spinosaurus-ess.skel


File diff suppressed because it is too large
+ 10 - 3
examples/stretchyman/export/stretchyman-pro.json


BIN
examples/stretchyman/export/stretchyman-pro.skel


+ 178 - 171
examples/tank/export/tank-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "gMeaUupgVoo14IkopUhIqYGpDOU", "spine": "3.6.32", "width": 7202.61, "height": 1298.88, "images": "./images/" },
+"skeleton": {
+	"hash": "JWZpG/bZaODL9WMrHd/eWznhkD0",
+	"spine": "3.7.08-beta",
+	"width": 7202.61,
+	"height": 1298.88,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "tank-root", "parent": "root", "y": 146.79 },
@@ -755,7 +762,7 @@
 			"antenna": {
 				"type": "mesh",
 				"uvs": [ 0.64286, 0.07876, 0.65354, 0.1535, 0.66325, 0.22138, 0.67367, 0.29433, 0.68383, 0.36543, 0.6936, 0.43374, 0.70311, 0.5003, 0.71311, 0.57031, 0.72327, 0.64139, 0.73406, 0.71689, 0.74441, 0.7893, 0.75614, 0.87141, 0.76905, 0.94311, 1, 0.94311, 1, 1, 0, 1, 0, 0.94311, 0.20106, 0.94311, 0.20106, 0.87094, 0.21461, 0.78847, 0.22651, 0.71607, 0.23886, 0.64099, 0.25036, 0.57105, 0.26206, 0.49983, 0.27306, 0.43291, 0.2843, 0.36454, 0.29593, 0.29382, 0.308, 0.22038, 0.319, 0.15345, 0.33142, 0.07796, 0.34423, 0, 0.63161, 0 ],
-				"triangles": [ 29, 0, 1, 29, 30, 0, 30, 31, 0, 27, 2, 3, 27, 28, 2, 28, 1, 2, 28, 29, 1, 26, 27, 3, 25, 4, 5, 25, 26, 4, 26, 3, 4, 24, 25, 5, 7, 23, 6, 23, 24, 6, 24, 5, 6, 7, 22, 23, 21, 8, 9, 21, 22, 8, 22, 7, 8, 20, 21, 9, 19, 20, 10, 20, 9, 10, 14, 15, 12, 15, 17, 12, 12, 13, 14, 15, 16, 17, 17, 11, 12, 17, 18, 11, 18, 19, 11, 19, 10, 11 ],
+				"triangles": [ 30, 31, 0, 29, 30, 0, 29, 0, 1, 28, 29, 1, 28, 1, 2, 27, 28, 2, 27, 2, 3, 26, 3, 4, 25, 26, 4, 25, 4, 5, 26, 27, 3, 24, 5, 6, 23, 24, 6, 7, 23, 6, 24, 25, 5, 22, 7, 8, 21, 22, 8, 21, 8, 9, 7, 22, 23, 20, 9, 10, 19, 20, 10, 20, 21, 9, 19, 10, 11, 18, 19, 11, 17, 18, 11, 17, 11, 12, 15, 16, 17, 12, 13, 14, 15, 17, 12, 14, 15, 12 ],
 				"vertices": [ 2, 10, 65.38, -3.14, 0.3125, 11, 23.38, -3.14, 0.6875, 2, 10, 42.73, -3.38, 0.66667, 11, 0.73, -3.38, 0.33333, 2, 9, 64.17, -3.59, 0.33333, 10, 22.17, -3.59, 0.66667, 2, 9, 42.06, -3.82, 0.66667, 10, 0.06, -3.82, 0.33333, 2, 8, 62.52, -4.04, 0.33333, 9, 20.52, -4.04, 0.66667, 2, 8, 41.82, -4.26, 0.66667, 9, -0.18, -4.26, 0.33333, 2, 7, 63.65, -4.47, 0.33333, 8, 21.65, -4.47, 0.66667, 2, 7, 42.44, -4.69, 0.66667, 8, 0.44, -4.69, 0.33333, 2, 6, 62.9, -4.91, 0.33333, 7, 20.9, -4.91, 0.66667, 2, 6, 40.03, -5.15, 0.66667, 7, -1.97, -5.15, 0.33333, 2, 5, 5.38, 58.09, 0.4, 6, 18.09, -5.38, 0.6, 1, 5, 5.64, 33.21, 1, 1, 5, 5.92, 11.48, 1, 1, 5, 11, 11.48, 1, 1, 5, 11, -5.76, 1, 1, 5, -11, -5.76, 1, 1, 5, -11, 11.48, 1, 1, 5, -6.58, 11.48, 1, 1, 5, -6.58, 33.35, 1, 2, 5, -6.28, 58.34, 0.4, 6, 18.34, 6.28, 0.6, 2, 6, 40.27, 6.02, 0.66667, 7, -1.73, 6.02, 0.33333, 2, 6, 63.03, 5.75, 0.33333, 7, 21.03, 5.75, 0.66667, 2, 7, 42.22, 5.49, 0.66667, 8, 0.22, 5.49, 0.33333, 2, 7, 63.8, 5.23, 0.33333, 8, 21.8, 5.23, 0.66667, 2, 8, 42.07, 4.99, 0.66667, 9, 0.07, 4.99, 0.33333, 2, 8, 62.79, 4.75, 0.33333, 9, 20.79, 4.75, 0.66667, 2, 9, 42.22, 4.49, 0.66667, 10, 0.22, 4.49, 0.33333, 2, 9, 64.47, 4.22, 0.33333, 10, 22.47, 4.22, 0.66667, 2, 10, 42.75, 3.98, 0.66667, 11, 0.75, 3.98, 0.33333, 2, 10, 65.62, 3.71, 0.3125, 11, 23.62, 3.71, 0.6875, 1, 11, 47.24, 3.43, 1, 1, 11, 47.24, -2.9, 1 ],
 				"hull": 32,
 				"edges": [ 28, 30, 28, 26, 30, 32, 26, 24, 24, 22, 32, 34, 34, 24, 34, 36, 36, 22, 60, 62, 38, 36, 20, 22, 38, 20, 40, 38, 18, 20, 40, 18, 42, 40, 16, 18, 42, 16, 44, 42, 14, 16, 44, 14, 46, 44, 12, 14, 46, 12, 48, 46, 10, 12, 48, 10, 50, 48, 8, 10, 50, 8, 52, 50, 6, 8, 52, 6, 54, 52, 4, 6, 54, 4, 56, 54, 2, 4, 56, 2, 60, 58, 58, 56, 62, 0, 0, 2, 58, 0 ],
@@ -773,7 +780,7 @@
 			"cannon-connector": {
 				"type": "mesh",
 				"uvs": [ 1, 0.03237, 1, 0.10603, 0.90988, 0.32859, 0.81975, 0.55116, 0.72963, 0.77373, 0.6395, 0.9963, 0.42157, 0.9963, 0.20364, 0.9963, 0, 0.85434, 0, 0.69902, 0.02268, 0.52884, 0, 0.31444, 0.21602, 0.12998, 0.43368, 0, 0.63547, 0.0037, 0.48408, 0.77059, 0.31496, 0.52497, 0.64133, 0.19648, 0.21516, 0.76766, 0.58346, 0.56471, 0.68444, 0.40146, 0.46758, 0.36649, 0.28935, 0.34604 ],
-				"triangles": [ 7, 18, 6, 6, 18, 15, 7, 8, 18, 8, 9, 18, 18, 16, 15, 15, 16, 19, 9, 10, 18, 18, 10, 16, 16, 21, 19, 19, 21, 20, 10, 22, 16, 10, 11, 22, 16, 22, 21, 21, 17, 20, 21, 12, 13, 17, 13, 14, 17, 21, 13, 11, 12, 22, 21, 22, 12, 6, 15, 5, 5, 15, 4, 15, 19, 4, 4, 19, 3, 19, 20, 3, 3, 20, 2, 20, 17, 2, 2, 17, 1, 17, 14, 1, 14, 0, 1 ],
+				"triangles": [ 21, 22, 12, 11, 12, 22, 17, 21, 13, 17, 13, 14, 21, 12, 13, 21, 17, 20, 16, 22, 21, 10, 11, 22, 10, 22, 16, 19, 21, 20, 16, 21, 19, 18, 10, 16, 9, 10, 18, 15, 16, 19, 18, 16, 15, 8, 9, 18, 7, 8, 18, 6, 18, 15, 7, 18, 6, 14, 0, 1, 17, 14, 1, 2, 17, 1, 20, 17, 2, 3, 20, 2, 19, 20, 3, 4, 19, 3, 15, 19, 4, 5, 15, 4, 6, 15, 5 ],
 				"vertices": [ 1, 12, 35.91, 69.08, 1, 1, 12, 35.91, 59.14, 1, 1, 12, 25.82, 29.09, 1, 1, 12, 15.72, -0.95, 1, 1, 12, 5.63, -31, 1, 1, 12, -4.46, -61.05, 1, 2, 12, -28.87, -61.05, 0.33333, 14, 28.87, 61.03, 0.66667, 1, 14, 53.28, 61.02, 1, 1, 14, 76.09, 41.84, 1, 1, 14, 71.17, 21.63, 1, 1, 14, 72.83, -1.62, 1, 1, 14, 70.38, -29.12, 1, 1, 14, 50.67, -56.14, 1, 2, 12, -28.43, 74.38, 0.41, 14, 28.43, -74.4, 0.59, 2, 12, -4.92, 72.95, 0.52, 14, 4.92, -72.95, 0.48, 2, 12, -21.87, -30.58, 0.49, 14, 21.87, 30.57, 0.51, 1, 14, 40.81, -2.6, 1, 2, 12, -4.26, 46.93, 0.49, 14, 4.26, -46.93, 0.51, 1, 14, 51.99, 30.15, 1, 2, 12, -10.74, -2.78, 0.49, 14, 10.74, 2.78, 0.51, 2, 12, 0.57, 19.25, 0.49, 14, -0.57, -19.25, 0.51, 1, 14, 23.72, -23.99, 1, 1, 14, 43.68, -26.76, 1 ],
 				"hull": 15,
 				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 0 ],
@@ -2241,7 +2248,7 @@
 			},
 			"smoke-glow": {
 				"color": [
-					{ "time": 0.1333, "color": "fffffffe" },
+					{ "time": 0.1333, "color": "ffffffff" },
 					{ "time": 0.1667, "color": "ffbc8af4" },
 					{ "time": 0.2, "color": "fc8e8e90" },
 					{ "time": 0.2667, "color": "fa3e3e1e" }
@@ -2253,9 +2260,9 @@
 			},
 			"smoke-puff1-bg": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1.0333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2264,9 +2271,9 @@
 			},
 			"smoke-puff1-bg2": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2275,9 +2282,9 @@
 			},
 			"smoke-puff1-bg3": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2286,9 +2293,9 @@
 			},
 			"smoke-puff1-bg4": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2297,9 +2304,9 @@
 			},
 			"smoke-puff1-bg5": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2308,9 +2315,9 @@
 			},
 			"smoke-puff1-bg6": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2319,9 +2326,9 @@
 			},
 			"smoke-puff1-bg7": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2330,9 +2337,9 @@
 			},
 			"smoke-puff1-bg8": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2341,9 +2348,9 @@
 			},
 			"smoke-puff1-bg9": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2352,9 +2359,9 @@
 			},
 			"smoke-puff1-bg10": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2363,8 +2370,8 @@
 			},
 			"smoke-puff1-bg11": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2373,8 +2380,8 @@
 			},
 			"smoke-puff1-bg12": {
 				"twoColor": [
-					{ "time": 0.3333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8667, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2383,8 +2390,8 @@
 			},
 			"smoke-puff1-bg13": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3667, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2393,8 +2400,8 @@
 			},
 			"smoke-puff1-bg14": {
 				"twoColor": [
-					{ "time": 0.4333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1.0667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2403,8 +2410,8 @@
 			},
 			"smoke-puff1-bg15": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2413,8 +2420,8 @@
 			},
 			"smoke-puff1-bg16": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2423,9 +2430,9 @@
 			},
 			"smoke-puff1-bg17": {
 				"twoColor": [
-					{ "time": 0.2333, "light": "ffd50cfe", "dark": "534035" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.2333, "light": "ffd50cff", "dark": "534035" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.6667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2434,9 +2441,9 @@
 			},
 			"smoke-puff1-bg18": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2445,9 +2452,9 @@
 			},
 			"smoke-puff1-bg20": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2456,25 +2463,25 @@
 			},
 			"smoke-puff1-bg21": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				]
 			},
 			"smoke-puff1-bg22": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				]
 			},
 			"smoke-puff1-bg23": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2483,8 +2490,8 @@
 			},
 			"smoke-puff1-bg24": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2493,8 +2500,8 @@
 			},
 			"smoke-puff1-bg25": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2503,8 +2510,8 @@
 			},
 			"smoke-puff1-bg26": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2513,8 +2520,8 @@
 			},
 			"smoke-puff1-bg27": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2523,12 +2530,12 @@
 			},
 			"smoke-puff1-fg": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1333, "light": "fde252fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.0667, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1333, "light": "fde252ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1.0333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2540,11 +2547,11 @@
 			},
 			"smoke-puff1-fg2": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2556,11 +2563,11 @@
 			},
 			"smoke-puff1-fg3": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffe457fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffe457ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2572,11 +2579,11 @@
 			},
 			"smoke-puff1-fg4": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "fae781fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "fae781ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2588,11 +2595,11 @@
 			},
 			"smoke-puff1-fg5": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2604,11 +2611,11 @@
 			},
 			"smoke-puff1-fg6": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2620,11 +2627,11 @@
 			},
 			"smoke-puff1-fg7": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2636,11 +2643,11 @@
 			},
 			"smoke-puff1-fg8": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2652,11 +2659,11 @@
 			},
 			"smoke-puff1-fg9": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2668,11 +2675,11 @@
 			},
 			"smoke-puff1-fg10": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "fce35dfe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "fce35dff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2684,8 +2691,8 @@
 			},
 			"smoke-puff1-fg11": {
 				"twoColor": [
-					{ "time": 0.3333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2694,8 +2701,8 @@
 			},
 			"smoke-puff1-fg12": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3667, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8667, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2704,8 +2711,8 @@
 			},
 			"smoke-puff1-fg13": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3667, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2714,8 +2721,8 @@
 			},
 			"smoke-puff1-fg14": {
 				"twoColor": [
-					{ "time": 0.4333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1.0667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2724,8 +2731,8 @@
 			},
 			"smoke-puff1-fg15": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2734,8 +2741,8 @@
 			},
 			"smoke-puff1-fg16": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2744,9 +2751,9 @@
 			},
 			"smoke-puff1-fg17": {
 				"twoColor": [
-					{ "time": 0.2333, "light": "e3c05efe", "dark": "ab7e59" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.2333, "light": "e3c05eff", "dark": "ab7e59" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.6667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2755,11 +2762,11 @@
 			},
 			"smoke-puff1-fg18": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2769,11 +2776,11 @@
 			},
 			"smoke-puff1-fg20": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2782,31 +2789,31 @@
 			},
 			"smoke-puff1-fg21": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				]
 			},
 			"smoke-puff1-fg22": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				]
 			},
 			"smoke-puff1-fg23": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2815,8 +2822,8 @@
 			},
 			"smoke-puff1-fg24": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2825,8 +2832,8 @@
 			},
 			"smoke-puff1-fg25": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2835,8 +2842,8 @@
 			},
 			"smoke-puff1-fg26": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2845,8 +2852,8 @@
 			},
 			"smoke-puff1-fg27": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [

BIN
examples/tank/export/tank-pro.skel


File diff suppressed because it is too large
+ 9 - 2
examples/vine/export/vine-pro.json


BIN
examples/vine/export/vine-pro.skel


+ 10 - 3
spine-as3/spine-as3-example/src/spineboy-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "K7oDNcMxrFpZQBcQZLCdAEjLad8", "spine": "3.6.32", "width": 470.72, "height": 731.57, "images": "./images/" },
+"skeleton": {
+	"hash": "0DoQUqP6ATLL322RHY3r98lgFr8",
+	"spine": "3.7.08-beta",
+	"width": 470.72,
+	"height": 731.57,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "dust", "parent": "root", "x": -303.6, "y": 32.64, "scaleX": 1.457 },
@@ -1095,10 +1102,10 @@
 					{ "time": 0, "color": "ffffff1e" },
 					{ "time": 0.0333, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.1667, "color": "ffffff00" },
-					{ "time": 0.2, "color": "fffffffe" },
+					{ "time": 0.2, "color": "ffffffff" },
 					{ "time": 0.4667, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.5333, "color": "ffffff00" },
-					{ "time": 0.5667, "color": "fffffffe" },
+					{ "time": 0.5667, "color": "ffffffff" },
 					{ "time": 0.8, "color": "ffffff1e" }
 				],
 				"attachment": [

+ 8 - 1
spine-cocos2d-objc/Resources/coin-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "4cI0KYdFTZbO7vkQYPFQN+yauDw", "spine": "3.6.32", "width": 260, "height": 359.92, "images": "./images/" },
+"skeleton": {
+	"hash": "lfmnIwRt8cjfHaBQWvT0v4odYdY",
+	"spine": "3.7.08-beta",
+	"width": 260,
+	"height": 359.92,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "coin-root", "parent": "root", "y": 300, "color": "ff0000ff" },

+ 9 - 2
spine-cocos2d-objc/Resources/goblins-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "zpNuAPL6j4bcbent5j8BOpZlfdA", "spine": "3.6.32", "width": 266.94, "height": 349.61, "images": "./images/" },
+"skeleton": {
+	"hash": "GEt0/K+46aqD75ngNEZOztV899k",
+	"spine": "3.7.08-beta",
+	"width": 266.94,
+	"height": 349.61,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41, "color": "ffcf00ff" },
@@ -87,7 +94,7 @@
 			"spear": {
 				"type": "mesh",
 				"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
-				"triangles": [ 5, 6, 4, 6, 7, 4, 4, 7, 3, 2, 9, 1, 9, 10, 1, 10, 12, 1, 12, 13, 1, 1, 13, 0, 10, 11, 12, 3, 8, 2, 8, 9, 2, 7, 8, 3 ],
+				"triangles": [ 4, 7, 3, 6, 7, 4, 5, 6, 4, 10, 11, 12, 1, 13, 0, 12, 13, 1, 10, 12, 1, 9, 10, 1, 2, 9, 1, 8, 9, 2, 3, 8, 2, 7, 8, 3 ],
 				"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
 				"hull": 14,
 				"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],

File diff suppressed because it is too large
+ 9 - 2
spine-cocos2d-objc/Resources/raptor-pro.json


+ 10 - 3
spine-cocos2d-objc/Resources/spineboy-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "K7oDNcMxrFpZQBcQZLCdAEjLad8", "spine": "3.6.32", "width": 470.72, "height": 731.57, "images": "./images/" },
+"skeleton": {
+	"hash": "0DoQUqP6ATLL322RHY3r98lgFr8",
+	"spine": "3.7.08-beta",
+	"width": 470.72,
+	"height": 731.57,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "dust", "parent": "root", "x": -303.6, "y": 32.64, "scaleX": 1.457 },
@@ -1095,10 +1102,10 @@
 					{ "time": 0, "color": "ffffff1e" },
 					{ "time": 0.0333, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.1667, "color": "ffffff00" },
-					{ "time": 0.2, "color": "fffffffe" },
+					{ "time": 0.2, "color": "ffffffff" },
 					{ "time": 0.4667, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.5333, "color": "ffffff00" },
-					{ "time": 0.5667, "color": "fffffffe" },
+					{ "time": 0.5667, "color": "ffffffff" },
 					{ "time": 0.8, "color": "ffffff1e" }
 				],
 				"attachment": [

+ 178 - 171
spine-cocos2d-objc/Resources/tank-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "gMeaUupgVoo14IkopUhIqYGpDOU", "spine": "3.6.32", "width": 7202.61, "height": 1298.88, "images": "./images/" },
+"skeleton": {
+	"hash": "JWZpG/bZaODL9WMrHd/eWznhkD0",
+	"spine": "3.7.08-beta",
+	"width": 7202.61,
+	"height": 1298.88,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "tank-root", "parent": "root", "y": 146.79 },
@@ -755,7 +762,7 @@
 			"antenna": {
 				"type": "mesh",
 				"uvs": [ 0.64286, 0.07876, 0.65354, 0.1535, 0.66325, 0.22138, 0.67367, 0.29433, 0.68383, 0.36543, 0.6936, 0.43374, 0.70311, 0.5003, 0.71311, 0.57031, 0.72327, 0.64139, 0.73406, 0.71689, 0.74441, 0.7893, 0.75614, 0.87141, 0.76905, 0.94311, 1, 0.94311, 1, 1, 0, 1, 0, 0.94311, 0.20106, 0.94311, 0.20106, 0.87094, 0.21461, 0.78847, 0.22651, 0.71607, 0.23886, 0.64099, 0.25036, 0.57105, 0.26206, 0.49983, 0.27306, 0.43291, 0.2843, 0.36454, 0.29593, 0.29382, 0.308, 0.22038, 0.319, 0.15345, 0.33142, 0.07796, 0.34423, 0, 0.63161, 0 ],
-				"triangles": [ 29, 0, 1, 29, 30, 0, 30, 31, 0, 27, 2, 3, 27, 28, 2, 28, 1, 2, 28, 29, 1, 26, 27, 3, 25, 4, 5, 25, 26, 4, 26, 3, 4, 24, 25, 5, 7, 23, 6, 23, 24, 6, 24, 5, 6, 7, 22, 23, 21, 8, 9, 21, 22, 8, 22, 7, 8, 20, 21, 9, 19, 20, 10, 20, 9, 10, 14, 15, 12, 15, 17, 12, 12, 13, 14, 15, 16, 17, 17, 11, 12, 17, 18, 11, 18, 19, 11, 19, 10, 11 ],
+				"triangles": [ 30, 31, 0, 29, 30, 0, 29, 0, 1, 28, 29, 1, 28, 1, 2, 27, 28, 2, 27, 2, 3, 26, 3, 4, 25, 26, 4, 25, 4, 5, 26, 27, 3, 24, 5, 6, 23, 24, 6, 7, 23, 6, 24, 25, 5, 22, 7, 8, 21, 22, 8, 21, 8, 9, 7, 22, 23, 20, 9, 10, 19, 20, 10, 20, 21, 9, 19, 10, 11, 18, 19, 11, 17, 18, 11, 17, 11, 12, 15, 16, 17, 12, 13, 14, 15, 17, 12, 14, 15, 12 ],
 				"vertices": [ 2, 10, 65.38, -3.14, 0.3125, 11, 23.38, -3.14, 0.6875, 2, 10, 42.73, -3.38, 0.66667, 11, 0.73, -3.38, 0.33333, 2, 9, 64.17, -3.59, 0.33333, 10, 22.17, -3.59, 0.66667, 2, 9, 42.06, -3.82, 0.66667, 10, 0.06, -3.82, 0.33333, 2, 8, 62.52, -4.04, 0.33333, 9, 20.52, -4.04, 0.66667, 2, 8, 41.82, -4.26, 0.66667, 9, -0.18, -4.26, 0.33333, 2, 7, 63.65, -4.47, 0.33333, 8, 21.65, -4.47, 0.66667, 2, 7, 42.44, -4.69, 0.66667, 8, 0.44, -4.69, 0.33333, 2, 6, 62.9, -4.91, 0.33333, 7, 20.9, -4.91, 0.66667, 2, 6, 40.03, -5.15, 0.66667, 7, -1.97, -5.15, 0.33333, 2, 5, 5.38, 58.09, 0.4, 6, 18.09, -5.38, 0.6, 1, 5, 5.64, 33.21, 1, 1, 5, 5.92, 11.48, 1, 1, 5, 11, 11.48, 1, 1, 5, 11, -5.76, 1, 1, 5, -11, -5.76, 1, 1, 5, -11, 11.48, 1, 1, 5, -6.58, 11.48, 1, 1, 5, -6.58, 33.35, 1, 2, 5, -6.28, 58.34, 0.4, 6, 18.34, 6.28, 0.6, 2, 6, 40.27, 6.02, 0.66667, 7, -1.73, 6.02, 0.33333, 2, 6, 63.03, 5.75, 0.33333, 7, 21.03, 5.75, 0.66667, 2, 7, 42.22, 5.49, 0.66667, 8, 0.22, 5.49, 0.33333, 2, 7, 63.8, 5.23, 0.33333, 8, 21.8, 5.23, 0.66667, 2, 8, 42.07, 4.99, 0.66667, 9, 0.07, 4.99, 0.33333, 2, 8, 62.79, 4.75, 0.33333, 9, 20.79, 4.75, 0.66667, 2, 9, 42.22, 4.49, 0.66667, 10, 0.22, 4.49, 0.33333, 2, 9, 64.47, 4.22, 0.33333, 10, 22.47, 4.22, 0.66667, 2, 10, 42.75, 3.98, 0.66667, 11, 0.75, 3.98, 0.33333, 2, 10, 65.62, 3.71, 0.3125, 11, 23.62, 3.71, 0.6875, 1, 11, 47.24, 3.43, 1, 1, 11, 47.24, -2.9, 1 ],
 				"hull": 32,
 				"edges": [ 28, 30, 28, 26, 30, 32, 26, 24, 24, 22, 32, 34, 34, 24, 34, 36, 36, 22, 60, 62, 38, 36, 20, 22, 38, 20, 40, 38, 18, 20, 40, 18, 42, 40, 16, 18, 42, 16, 44, 42, 14, 16, 44, 14, 46, 44, 12, 14, 46, 12, 48, 46, 10, 12, 48, 10, 50, 48, 8, 10, 50, 8, 52, 50, 6, 8, 52, 6, 54, 52, 4, 6, 54, 4, 56, 54, 2, 4, 56, 2, 60, 58, 58, 56, 62, 0, 0, 2, 58, 0 ],
@@ -773,7 +780,7 @@
 			"cannon-connector": {
 				"type": "mesh",
 				"uvs": [ 1, 0.03237, 1, 0.10603, 0.90988, 0.32859, 0.81975, 0.55116, 0.72963, 0.77373, 0.6395, 0.9963, 0.42157, 0.9963, 0.20364, 0.9963, 0, 0.85434, 0, 0.69902, 0.02268, 0.52884, 0, 0.31444, 0.21602, 0.12998, 0.43368, 0, 0.63547, 0.0037, 0.48408, 0.77059, 0.31496, 0.52497, 0.64133, 0.19648, 0.21516, 0.76766, 0.58346, 0.56471, 0.68444, 0.40146, 0.46758, 0.36649, 0.28935, 0.34604 ],
-				"triangles": [ 7, 18, 6, 6, 18, 15, 7, 8, 18, 8, 9, 18, 18, 16, 15, 15, 16, 19, 9, 10, 18, 18, 10, 16, 16, 21, 19, 19, 21, 20, 10, 22, 16, 10, 11, 22, 16, 22, 21, 21, 17, 20, 21, 12, 13, 17, 13, 14, 17, 21, 13, 11, 12, 22, 21, 22, 12, 6, 15, 5, 5, 15, 4, 15, 19, 4, 4, 19, 3, 19, 20, 3, 3, 20, 2, 20, 17, 2, 2, 17, 1, 17, 14, 1, 14, 0, 1 ],
+				"triangles": [ 21, 22, 12, 11, 12, 22, 17, 21, 13, 17, 13, 14, 21, 12, 13, 21, 17, 20, 16, 22, 21, 10, 11, 22, 10, 22, 16, 19, 21, 20, 16, 21, 19, 18, 10, 16, 9, 10, 18, 15, 16, 19, 18, 16, 15, 8, 9, 18, 7, 8, 18, 6, 18, 15, 7, 18, 6, 14, 0, 1, 17, 14, 1, 2, 17, 1, 20, 17, 2, 3, 20, 2, 19, 20, 3, 4, 19, 3, 15, 19, 4, 5, 15, 4, 6, 15, 5 ],
 				"vertices": [ 1, 12, 35.91, 69.08, 1, 1, 12, 35.91, 59.14, 1, 1, 12, 25.82, 29.09, 1, 1, 12, 15.72, -0.95, 1, 1, 12, 5.63, -31, 1, 1, 12, -4.46, -61.05, 1, 2, 12, -28.87, -61.05, 0.33333, 14, 28.87, 61.03, 0.66667, 1, 14, 53.28, 61.02, 1, 1, 14, 76.09, 41.84, 1, 1, 14, 71.17, 21.63, 1, 1, 14, 72.83, -1.62, 1, 1, 14, 70.38, -29.12, 1, 1, 14, 50.67, -56.14, 1, 2, 12, -28.43, 74.38, 0.41, 14, 28.43, -74.4, 0.59, 2, 12, -4.92, 72.95, 0.52, 14, 4.92, -72.95, 0.48, 2, 12, -21.87, -30.58, 0.49, 14, 21.87, 30.57, 0.51, 1, 14, 40.81, -2.6, 1, 2, 12, -4.26, 46.93, 0.49, 14, 4.26, -46.93, 0.51, 1, 14, 51.99, 30.15, 1, 2, 12, -10.74, -2.78, 0.49, 14, 10.74, 2.78, 0.51, 2, 12, 0.57, 19.25, 0.49, 14, -0.57, -19.25, 0.51, 1, 14, 23.72, -23.99, 1, 1, 14, 43.68, -26.76, 1 ],
 				"hull": 15,
 				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 0 ],
@@ -2241,7 +2248,7 @@
 			},
 			"smoke-glow": {
 				"color": [
-					{ "time": 0.1333, "color": "fffffffe" },
+					{ "time": 0.1333, "color": "ffffffff" },
 					{ "time": 0.1667, "color": "ffbc8af4" },
 					{ "time": 0.2, "color": "fc8e8e90" },
 					{ "time": 0.2667, "color": "fa3e3e1e" }
@@ -2253,9 +2260,9 @@
 			},
 			"smoke-puff1-bg": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1.0333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2264,9 +2271,9 @@
 			},
 			"smoke-puff1-bg2": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2275,9 +2282,9 @@
 			},
 			"smoke-puff1-bg3": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2286,9 +2293,9 @@
 			},
 			"smoke-puff1-bg4": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2297,9 +2304,9 @@
 			},
 			"smoke-puff1-bg5": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2308,9 +2315,9 @@
 			},
 			"smoke-puff1-bg6": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2319,9 +2326,9 @@
 			},
 			"smoke-puff1-bg7": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2330,9 +2337,9 @@
 			},
 			"smoke-puff1-bg8": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2341,9 +2348,9 @@
 			},
 			"smoke-puff1-bg9": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2352,9 +2359,9 @@
 			},
 			"smoke-puff1-bg10": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2363,8 +2370,8 @@
 			},
 			"smoke-puff1-bg11": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2373,8 +2380,8 @@
 			},
 			"smoke-puff1-bg12": {
 				"twoColor": [
-					{ "time": 0.3333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8667, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2383,8 +2390,8 @@
 			},
 			"smoke-puff1-bg13": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3667, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2393,8 +2400,8 @@
 			},
 			"smoke-puff1-bg14": {
 				"twoColor": [
-					{ "time": 0.4333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1.0667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2403,8 +2410,8 @@
 			},
 			"smoke-puff1-bg15": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2413,8 +2420,8 @@
 			},
 			"smoke-puff1-bg16": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2423,9 +2430,9 @@
 			},
 			"smoke-puff1-bg17": {
 				"twoColor": [
-					{ "time": 0.2333, "light": "ffd50cfe", "dark": "534035" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.2333, "light": "ffd50cff", "dark": "534035" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.6667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2434,9 +2441,9 @@
 			},
 			"smoke-puff1-bg18": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2445,9 +2452,9 @@
 			},
 			"smoke-puff1-bg20": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2456,25 +2463,25 @@
 			},
 			"smoke-puff1-bg21": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				]
 			},
 			"smoke-puff1-bg22": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				]
 			},
 			"smoke-puff1-bg23": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2483,8 +2490,8 @@
 			},
 			"smoke-puff1-bg24": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2493,8 +2500,8 @@
 			},
 			"smoke-puff1-bg25": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2503,8 +2510,8 @@
 			},
 			"smoke-puff1-bg26": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2513,8 +2520,8 @@
 			},
 			"smoke-puff1-bg27": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2523,12 +2530,12 @@
 			},
 			"smoke-puff1-fg": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1333, "light": "fde252fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.0667, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1333, "light": "fde252ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1.0333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2540,11 +2547,11 @@
 			},
 			"smoke-puff1-fg2": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2556,11 +2563,11 @@
 			},
 			"smoke-puff1-fg3": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffe457fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffe457ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2572,11 +2579,11 @@
 			},
 			"smoke-puff1-fg4": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "fae781fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "fae781ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2588,11 +2595,11 @@
 			},
 			"smoke-puff1-fg5": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2604,11 +2611,11 @@
 			},
 			"smoke-puff1-fg6": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2620,11 +2627,11 @@
 			},
 			"smoke-puff1-fg7": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2636,11 +2643,11 @@
 			},
 			"smoke-puff1-fg8": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2652,11 +2659,11 @@
 			},
 			"smoke-puff1-fg9": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2668,11 +2675,11 @@
 			},
 			"smoke-puff1-fg10": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "fce35dfe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "fce35dff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2684,8 +2691,8 @@
 			},
 			"smoke-puff1-fg11": {
 				"twoColor": [
-					{ "time": 0.3333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2694,8 +2701,8 @@
 			},
 			"smoke-puff1-fg12": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3667, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8667, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2704,8 +2711,8 @@
 			},
 			"smoke-puff1-fg13": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3667, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2714,8 +2721,8 @@
 			},
 			"smoke-puff1-fg14": {
 				"twoColor": [
-					{ "time": 0.4333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1.0667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2724,8 +2731,8 @@
 			},
 			"smoke-puff1-fg15": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2734,8 +2741,8 @@
 			},
 			"smoke-puff1-fg16": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2744,9 +2751,9 @@
 			},
 			"smoke-puff1-fg17": {
 				"twoColor": [
-					{ "time": 0.2333, "light": "e3c05efe", "dark": "ab7e59" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.2333, "light": "e3c05eff", "dark": "ab7e59" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.6667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2755,11 +2762,11 @@
 			},
 			"smoke-puff1-fg18": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2769,11 +2776,11 @@
 			},
 			"smoke-puff1-fg20": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2782,31 +2789,31 @@
 			},
 			"smoke-puff1-fg21": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				]
 			},
 			"smoke-puff1-fg22": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				]
 			},
 			"smoke-puff1-fg23": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2815,8 +2822,8 @@
 			},
 			"smoke-puff1-fg24": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2825,8 +2832,8 @@
 			},
 			"smoke-puff1-fg25": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2835,8 +2842,8 @@
 			},
 			"smoke-puff1-fg26": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2845,8 +2852,8 @@
 			},
 			"smoke-puff1-fg27": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [

+ 8 - 1
spine-cocos2dx/example/Resources/common/coin-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "4cI0KYdFTZbO7vkQYPFQN+yauDw", "spine": "3.6.32", "width": 260, "height": 359.92, "images": "./images/" },
+"skeleton": {
+	"hash": "lfmnIwRt8cjfHaBQWvT0v4odYdY",
+	"spine": "3.7.08-beta",
+	"width": 260,
+	"height": 359.92,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "coin-root", "parent": "root", "y": 300, "color": "ff0000ff" },

+ 9 - 2
spine-cocos2dx/example/Resources/common/goblins-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "zpNuAPL6j4bcbent5j8BOpZlfdA", "spine": "3.6.32", "width": 266.94, "height": 349.61, "images": "./images/" },
+"skeleton": {
+	"hash": "GEt0/K+46aqD75ngNEZOztV899k",
+	"spine": "3.7.08-beta",
+	"width": 266.94,
+	"height": 349.61,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41, "color": "ffcf00ff" },
@@ -87,7 +94,7 @@
 			"spear": {
 				"type": "mesh",
 				"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
-				"triangles": [ 5, 6, 4, 6, 7, 4, 4, 7, 3, 2, 9, 1, 9, 10, 1, 10, 12, 1, 12, 13, 1, 1, 13, 0, 10, 11, 12, 3, 8, 2, 8, 9, 2, 7, 8, 3 ],
+				"triangles": [ 4, 7, 3, 6, 7, 4, 5, 6, 4, 10, 11, 12, 1, 13, 0, 12, 13, 1, 10, 12, 1, 9, 10, 1, 2, 9, 1, 8, 9, 2, 3, 8, 2, 7, 8, 3 ],
 				"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
 				"hull": 14,
 				"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],

File diff suppressed because it is too large
+ 9 - 2
spine-cocos2dx/example/Resources/common/raptor-pro.json


+ 10 - 3
spine-cocos2dx/example/Resources/common/spineboy-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "K7oDNcMxrFpZQBcQZLCdAEjLad8", "spine": "3.6.32", "width": 470.72, "height": 731.57, "images": "./images/" },
+"skeleton": {
+	"hash": "0DoQUqP6ATLL322RHY3r98lgFr8",
+	"spine": "3.7.08-beta",
+	"width": 470.72,
+	"height": 731.57,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "dust", "parent": "root", "x": -303.6, "y": 32.64, "scaleX": 1.457 },
@@ -1095,10 +1102,10 @@
 					{ "time": 0, "color": "ffffff1e" },
 					{ "time": 0.0333, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.1667, "color": "ffffff00" },
-					{ "time": 0.2, "color": "fffffffe" },
+					{ "time": 0.2, "color": "ffffffff" },
 					{ "time": 0.4667, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.5333, "color": "ffffff00" },
-					{ "time": 0.5667, "color": "fffffffe" },
+					{ "time": 0.5667, "color": "ffffffff" },
 					{ "time": 0.8, "color": "ffffff1e" }
 				],
 				"attachment": [

+ 178 - 171
spine-cocos2dx/example/Resources/common/tank-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "gMeaUupgVoo14IkopUhIqYGpDOU", "spine": "3.6.32", "width": 7202.61, "height": 1298.88, "images": "./images/" },
+"skeleton": {
+	"hash": "JWZpG/bZaODL9WMrHd/eWznhkD0",
+	"spine": "3.7.08-beta",
+	"width": 7202.61,
+	"height": 1298.88,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "tank-root", "parent": "root", "y": 146.79 },
@@ -755,7 +762,7 @@
 			"antenna": {
 				"type": "mesh",
 				"uvs": [ 0.64286, 0.07876, 0.65354, 0.1535, 0.66325, 0.22138, 0.67367, 0.29433, 0.68383, 0.36543, 0.6936, 0.43374, 0.70311, 0.5003, 0.71311, 0.57031, 0.72327, 0.64139, 0.73406, 0.71689, 0.74441, 0.7893, 0.75614, 0.87141, 0.76905, 0.94311, 1, 0.94311, 1, 1, 0, 1, 0, 0.94311, 0.20106, 0.94311, 0.20106, 0.87094, 0.21461, 0.78847, 0.22651, 0.71607, 0.23886, 0.64099, 0.25036, 0.57105, 0.26206, 0.49983, 0.27306, 0.43291, 0.2843, 0.36454, 0.29593, 0.29382, 0.308, 0.22038, 0.319, 0.15345, 0.33142, 0.07796, 0.34423, 0, 0.63161, 0 ],
-				"triangles": [ 29, 0, 1, 29, 30, 0, 30, 31, 0, 27, 2, 3, 27, 28, 2, 28, 1, 2, 28, 29, 1, 26, 27, 3, 25, 4, 5, 25, 26, 4, 26, 3, 4, 24, 25, 5, 7, 23, 6, 23, 24, 6, 24, 5, 6, 7, 22, 23, 21, 8, 9, 21, 22, 8, 22, 7, 8, 20, 21, 9, 19, 20, 10, 20, 9, 10, 14, 15, 12, 15, 17, 12, 12, 13, 14, 15, 16, 17, 17, 11, 12, 17, 18, 11, 18, 19, 11, 19, 10, 11 ],
+				"triangles": [ 30, 31, 0, 29, 30, 0, 29, 0, 1, 28, 29, 1, 28, 1, 2, 27, 28, 2, 27, 2, 3, 26, 3, 4, 25, 26, 4, 25, 4, 5, 26, 27, 3, 24, 5, 6, 23, 24, 6, 7, 23, 6, 24, 25, 5, 22, 7, 8, 21, 22, 8, 21, 8, 9, 7, 22, 23, 20, 9, 10, 19, 20, 10, 20, 21, 9, 19, 10, 11, 18, 19, 11, 17, 18, 11, 17, 11, 12, 15, 16, 17, 12, 13, 14, 15, 17, 12, 14, 15, 12 ],
 				"vertices": [ 2, 10, 65.38, -3.14, 0.3125, 11, 23.38, -3.14, 0.6875, 2, 10, 42.73, -3.38, 0.66667, 11, 0.73, -3.38, 0.33333, 2, 9, 64.17, -3.59, 0.33333, 10, 22.17, -3.59, 0.66667, 2, 9, 42.06, -3.82, 0.66667, 10, 0.06, -3.82, 0.33333, 2, 8, 62.52, -4.04, 0.33333, 9, 20.52, -4.04, 0.66667, 2, 8, 41.82, -4.26, 0.66667, 9, -0.18, -4.26, 0.33333, 2, 7, 63.65, -4.47, 0.33333, 8, 21.65, -4.47, 0.66667, 2, 7, 42.44, -4.69, 0.66667, 8, 0.44, -4.69, 0.33333, 2, 6, 62.9, -4.91, 0.33333, 7, 20.9, -4.91, 0.66667, 2, 6, 40.03, -5.15, 0.66667, 7, -1.97, -5.15, 0.33333, 2, 5, 5.38, 58.09, 0.4, 6, 18.09, -5.38, 0.6, 1, 5, 5.64, 33.21, 1, 1, 5, 5.92, 11.48, 1, 1, 5, 11, 11.48, 1, 1, 5, 11, -5.76, 1, 1, 5, -11, -5.76, 1, 1, 5, -11, 11.48, 1, 1, 5, -6.58, 11.48, 1, 1, 5, -6.58, 33.35, 1, 2, 5, -6.28, 58.34, 0.4, 6, 18.34, 6.28, 0.6, 2, 6, 40.27, 6.02, 0.66667, 7, -1.73, 6.02, 0.33333, 2, 6, 63.03, 5.75, 0.33333, 7, 21.03, 5.75, 0.66667, 2, 7, 42.22, 5.49, 0.66667, 8, 0.22, 5.49, 0.33333, 2, 7, 63.8, 5.23, 0.33333, 8, 21.8, 5.23, 0.66667, 2, 8, 42.07, 4.99, 0.66667, 9, 0.07, 4.99, 0.33333, 2, 8, 62.79, 4.75, 0.33333, 9, 20.79, 4.75, 0.66667, 2, 9, 42.22, 4.49, 0.66667, 10, 0.22, 4.49, 0.33333, 2, 9, 64.47, 4.22, 0.33333, 10, 22.47, 4.22, 0.66667, 2, 10, 42.75, 3.98, 0.66667, 11, 0.75, 3.98, 0.33333, 2, 10, 65.62, 3.71, 0.3125, 11, 23.62, 3.71, 0.6875, 1, 11, 47.24, 3.43, 1, 1, 11, 47.24, -2.9, 1 ],
 				"hull": 32,
 				"edges": [ 28, 30, 28, 26, 30, 32, 26, 24, 24, 22, 32, 34, 34, 24, 34, 36, 36, 22, 60, 62, 38, 36, 20, 22, 38, 20, 40, 38, 18, 20, 40, 18, 42, 40, 16, 18, 42, 16, 44, 42, 14, 16, 44, 14, 46, 44, 12, 14, 46, 12, 48, 46, 10, 12, 48, 10, 50, 48, 8, 10, 50, 8, 52, 50, 6, 8, 52, 6, 54, 52, 4, 6, 54, 4, 56, 54, 2, 4, 56, 2, 60, 58, 58, 56, 62, 0, 0, 2, 58, 0 ],
@@ -773,7 +780,7 @@
 			"cannon-connector": {
 				"type": "mesh",
 				"uvs": [ 1, 0.03237, 1, 0.10603, 0.90988, 0.32859, 0.81975, 0.55116, 0.72963, 0.77373, 0.6395, 0.9963, 0.42157, 0.9963, 0.20364, 0.9963, 0, 0.85434, 0, 0.69902, 0.02268, 0.52884, 0, 0.31444, 0.21602, 0.12998, 0.43368, 0, 0.63547, 0.0037, 0.48408, 0.77059, 0.31496, 0.52497, 0.64133, 0.19648, 0.21516, 0.76766, 0.58346, 0.56471, 0.68444, 0.40146, 0.46758, 0.36649, 0.28935, 0.34604 ],
-				"triangles": [ 7, 18, 6, 6, 18, 15, 7, 8, 18, 8, 9, 18, 18, 16, 15, 15, 16, 19, 9, 10, 18, 18, 10, 16, 16, 21, 19, 19, 21, 20, 10, 22, 16, 10, 11, 22, 16, 22, 21, 21, 17, 20, 21, 12, 13, 17, 13, 14, 17, 21, 13, 11, 12, 22, 21, 22, 12, 6, 15, 5, 5, 15, 4, 15, 19, 4, 4, 19, 3, 19, 20, 3, 3, 20, 2, 20, 17, 2, 2, 17, 1, 17, 14, 1, 14, 0, 1 ],
+				"triangles": [ 21, 22, 12, 11, 12, 22, 17, 21, 13, 17, 13, 14, 21, 12, 13, 21, 17, 20, 16, 22, 21, 10, 11, 22, 10, 22, 16, 19, 21, 20, 16, 21, 19, 18, 10, 16, 9, 10, 18, 15, 16, 19, 18, 16, 15, 8, 9, 18, 7, 8, 18, 6, 18, 15, 7, 18, 6, 14, 0, 1, 17, 14, 1, 2, 17, 1, 20, 17, 2, 3, 20, 2, 19, 20, 3, 4, 19, 3, 15, 19, 4, 5, 15, 4, 6, 15, 5 ],
 				"vertices": [ 1, 12, 35.91, 69.08, 1, 1, 12, 35.91, 59.14, 1, 1, 12, 25.82, 29.09, 1, 1, 12, 15.72, -0.95, 1, 1, 12, 5.63, -31, 1, 1, 12, -4.46, -61.05, 1, 2, 12, -28.87, -61.05, 0.33333, 14, 28.87, 61.03, 0.66667, 1, 14, 53.28, 61.02, 1, 1, 14, 76.09, 41.84, 1, 1, 14, 71.17, 21.63, 1, 1, 14, 72.83, -1.62, 1, 1, 14, 70.38, -29.12, 1, 1, 14, 50.67, -56.14, 1, 2, 12, -28.43, 74.38, 0.41, 14, 28.43, -74.4, 0.59, 2, 12, -4.92, 72.95, 0.52, 14, 4.92, -72.95, 0.48, 2, 12, -21.87, -30.58, 0.49, 14, 21.87, 30.57, 0.51, 1, 14, 40.81, -2.6, 1, 2, 12, -4.26, 46.93, 0.49, 14, 4.26, -46.93, 0.51, 1, 14, 51.99, 30.15, 1, 2, 12, -10.74, -2.78, 0.49, 14, 10.74, 2.78, 0.51, 2, 12, 0.57, 19.25, 0.49, 14, -0.57, -19.25, 0.51, 1, 14, 23.72, -23.99, 1, 1, 14, 43.68, -26.76, 1 ],
 				"hull": 15,
 				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 0 ],
@@ -2241,7 +2248,7 @@
 			},
 			"smoke-glow": {
 				"color": [
-					{ "time": 0.1333, "color": "fffffffe" },
+					{ "time": 0.1333, "color": "ffffffff" },
 					{ "time": 0.1667, "color": "ffbc8af4" },
 					{ "time": 0.2, "color": "fc8e8e90" },
 					{ "time": 0.2667, "color": "fa3e3e1e" }
@@ -2253,9 +2260,9 @@
 			},
 			"smoke-puff1-bg": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1.0333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2264,9 +2271,9 @@
 			},
 			"smoke-puff1-bg2": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2275,9 +2282,9 @@
 			},
 			"smoke-puff1-bg3": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2286,9 +2293,9 @@
 			},
 			"smoke-puff1-bg4": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2297,9 +2304,9 @@
 			},
 			"smoke-puff1-bg5": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2308,9 +2315,9 @@
 			},
 			"smoke-puff1-bg6": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2319,9 +2326,9 @@
 			},
 			"smoke-puff1-bg7": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2330,9 +2337,9 @@
 			},
 			"smoke-puff1-bg8": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2341,9 +2348,9 @@
 			},
 			"smoke-puff1-bg9": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2352,9 +2359,9 @@
 			},
 			"smoke-puff1-bg10": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2363,8 +2370,8 @@
 			},
 			"smoke-puff1-bg11": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2373,8 +2380,8 @@
 			},
 			"smoke-puff1-bg12": {
 				"twoColor": [
-					{ "time": 0.3333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8667, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2383,8 +2390,8 @@
 			},
 			"smoke-puff1-bg13": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3667, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2393,8 +2400,8 @@
 			},
 			"smoke-puff1-bg14": {
 				"twoColor": [
-					{ "time": 0.4333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1.0667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2403,8 +2410,8 @@
 			},
 			"smoke-puff1-bg15": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2413,8 +2420,8 @@
 			},
 			"smoke-puff1-bg16": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2423,9 +2430,9 @@
 			},
 			"smoke-puff1-bg17": {
 				"twoColor": [
-					{ "time": 0.2333, "light": "ffd50cfe", "dark": "534035" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.2333, "light": "ffd50cff", "dark": "534035" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.6667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2434,9 +2441,9 @@
 			},
 			"smoke-puff1-bg18": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2445,9 +2452,9 @@
 			},
 			"smoke-puff1-bg20": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2456,25 +2463,25 @@
 			},
 			"smoke-puff1-bg21": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				]
 			},
 			"smoke-puff1-bg22": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				]
 			},
 			"smoke-puff1-bg23": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2483,8 +2490,8 @@
 			},
 			"smoke-puff1-bg24": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2493,8 +2500,8 @@
 			},
 			"smoke-puff1-bg25": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2503,8 +2510,8 @@
 			},
 			"smoke-puff1-bg26": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2513,8 +2520,8 @@
 			},
 			"smoke-puff1-bg27": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2523,12 +2530,12 @@
 			},
 			"smoke-puff1-fg": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1333, "light": "fde252fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.0667, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1333, "light": "fde252ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1.0333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2540,11 +2547,11 @@
 			},
 			"smoke-puff1-fg2": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2556,11 +2563,11 @@
 			},
 			"smoke-puff1-fg3": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffe457fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffe457ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2572,11 +2579,11 @@
 			},
 			"smoke-puff1-fg4": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "fae781fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "fae781ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2588,11 +2595,11 @@
 			},
 			"smoke-puff1-fg5": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2604,11 +2611,11 @@
 			},
 			"smoke-puff1-fg6": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2620,11 +2627,11 @@
 			},
 			"smoke-puff1-fg7": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2636,11 +2643,11 @@
 			},
 			"smoke-puff1-fg8": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2652,11 +2659,11 @@
 			},
 			"smoke-puff1-fg9": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2668,11 +2675,11 @@
 			},
 			"smoke-puff1-fg10": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "fce35dfe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "fce35dff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2684,8 +2691,8 @@
 			},
 			"smoke-puff1-fg11": {
 				"twoColor": [
-					{ "time": 0.3333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2694,8 +2701,8 @@
 			},
 			"smoke-puff1-fg12": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3667, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8667, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2704,8 +2711,8 @@
 			},
 			"smoke-puff1-fg13": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3667, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2714,8 +2721,8 @@
 			},
 			"smoke-puff1-fg14": {
 				"twoColor": [
-					{ "time": 0.4333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1.0667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2724,8 +2731,8 @@
 			},
 			"smoke-puff1-fg15": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2734,8 +2741,8 @@
 			},
 			"smoke-puff1-fg16": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2744,9 +2751,9 @@
 			},
 			"smoke-puff1-fg17": {
 				"twoColor": [
-					{ "time": 0.2333, "light": "e3c05efe", "dark": "ab7e59" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.2333, "light": "e3c05eff", "dark": "ab7e59" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.6667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2755,11 +2762,11 @@
 			},
 			"smoke-puff1-fg18": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2769,11 +2776,11 @@
 			},
 			"smoke-puff1-fg20": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2782,31 +2789,31 @@
 			},
 			"smoke-puff1-fg21": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				]
 			},
 			"smoke-puff1-fg22": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				]
 			},
 			"smoke-puff1-fg23": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2815,8 +2822,8 @@
 			},
 			"smoke-puff1-fg24": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2825,8 +2832,8 @@
 			},
 			"smoke-puff1-fg25": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2835,8 +2842,8 @@
 			},
 			"smoke-puff1-fg26": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2845,8 +2852,8 @@
 			},
 			"smoke-puff1-fg27": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [

+ 8 - 1
spine-corona/data/coin-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "4cI0KYdFTZbO7vkQYPFQN+yauDw", "spine": "3.6.32", "width": 260, "height": 359.92, "images": "./images/" },
+"skeleton": {
+	"hash": "lfmnIwRt8cjfHaBQWvT0v4odYdY",
+	"spine": "3.7.08-beta",
+	"width": 260,
+	"height": 359.92,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "coin-root", "parent": "root", "y": 300, "color": "ff0000ff" },

+ 9 - 2
spine-corona/data/goblins-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "zpNuAPL6j4bcbent5j8BOpZlfdA", "spine": "3.6.32", "width": 266.94, "height": 349.61, "images": "./images/" },
+"skeleton": {
+	"hash": "GEt0/K+46aqD75ngNEZOztV899k",
+	"spine": "3.7.08-beta",
+	"width": 266.94,
+	"height": 349.61,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41, "color": "ffcf00ff" },
@@ -87,7 +94,7 @@
 			"spear": {
 				"type": "mesh",
 				"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
-				"triangles": [ 5, 6, 4, 6, 7, 4, 4, 7, 3, 2, 9, 1, 9, 10, 1, 10, 12, 1, 12, 13, 1, 1, 13, 0, 10, 11, 12, 3, 8, 2, 8, 9, 2, 7, 8, 3 ],
+				"triangles": [ 4, 7, 3, 6, 7, 4, 5, 6, 4, 10, 11, 12, 1, 13, 0, 12, 13, 1, 10, 12, 1, 9, 10, 1, 2, 9, 1, 8, 9, 2, 3, 8, 2, 7, 8, 3 ],
 				"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
 				"hull": 14,
 				"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],

File diff suppressed because it is too large
+ 318 - 0
spine-corona/data/owl-pro.json


+ 195 - 0
spine-corona/data/owl.atlas

@@ -0,0 +1,195 @@
+
+owl.png
+size: 1024,512
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+L_eye-closed
+  rotate: false
+  xy: 508, 115
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+L_eye-iris
+  rotate: false
+  xy: 826, 183
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+L_eye-light
+  rotate: false
+  xy: 1001, 488
+  size: 21, 20
+  orig: 21, 20
+  offset: 0, 0
+  index: -1
+L_eye-pupil
+  rotate: false
+  xy: 752, 154
+  size: 63, 60
+  orig: 63, 60
+  offset: 0, 0
+  index: -1
+L_foot
+  rotate: false
+  xy: 817, 133
+  size: 64, 48
+  orig: 64, 48
+  offset: 0, 0
+  index: -1
+L_wing
+  rotate: false
+  xy: 342, 91
+  size: 81, 110
+  orig: 81, 110
+  offset: 0, 0
+  index: -1
+R_eye-closed
+  rotate: false
+  xy: 508, 27
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+R_eye-iris
+  rotate: true
+  xy: 600, 111
+  size: 90, 86
+  orig: 90, 86
+  offset: 0, 0
+  index: -1
+R_eye-light
+  rotate: false
+  xy: 1001, 466
+  size: 21, 20
+  orig: 21, 20
+  offset: 0, 0
+  index: -1
+R_eye-pupil
+  rotate: true
+  xy: 691, 72
+  size: 63, 60
+  orig: 63, 60
+  offset: 0, 0
+  index: -1
+R_foot
+  rotate: false
+  xy: 814, 83
+  size: 64, 48
+  orig: 64, 48
+  offset: 0, 0
+  index: -1
+R_wing
+  rotate: false
+  xy: 425, 91
+  size: 81, 110
+  orig: 81, 110
+  offset: 0, 0
+  index: -1
+beak
+  rotate: false
+  xy: 883, 140
+  size: 39, 41
+  orig: 39, 41
+  offset: 0, 0
+  index: -1
+beak-down
+  rotate: true
+  xy: 753, 53
+  size: 37, 40
+  orig: 37, 40
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 2, 5
+  size: 248, 196
+  orig: 248, 196
+  offset: 0, 0
+  index: -1
+feather-1
+  rotate: false
+  xy: 753, 92
+  size: 59, 60
+  orig: 59, 60
+  offset: 0, 0
+  index: -1
+feather-2
+  rotate: false
+  xy: 688, 137
+  size: 62, 65
+  orig: 62, 65
+  offset: 0, 0
+  index: -1
+feather-3
+  rotate: true
+  xy: 600, 2
+  size: 56, 76
+  orig: 56, 76
+  offset: 0, 0
+  index: -1
+head-base
+  rotate: false
+  xy: 621, 271
+  size: 299, 237
+  orig: 299, 237
+  offset: 0, 0
+  index: -1
+leaf-1
+  rotate: false
+  xy: 922, 273
+  size: 76, 101
+  orig: 76, 101
+  offset: 0, 0
+  index: -1
+leaf-2
+  rotate: true
+  xy: 621, 204
+  size: 65, 95
+  orig: 65, 95
+  offset: 0, 0
+  index: -1
+leaf-3
+  rotate: true
+  xy: 922, 376
+  size: 132, 77
+  orig: 132, 77
+  offset: 0, 0
+  index: -1
+leaf-4
+  rotate: false
+  xy: 600, 60
+  size: 89, 49
+  orig: 89, 49
+  offset: 0, 0
+  index: -1
+leaf-5
+  rotate: true
+  xy: 718, 216
+  size: 53, 106
+  orig: 53, 106
+  offset: 0, 0
+  index: -1
+leaf-6
+  rotate: false
+  xy: 252, 85
+  size: 88, 116
+  orig: 88, 116
+  offset: 0, 0
+  index: -1
+leaf-7
+  rotate: true
+  xy: 252, 29
+  size: 54, 86
+  orig: 54, 86
+  offset: 0, 0
+  index: -1
+wood
+  rotate: false
+  xy: 2, 203
+  size: 617, 305
+  orig: 617, 305
+  offset: 0, 0
+  index: -1

BIN
spine-corona/data/owl.png


File diff suppressed because it is too large
+ 9 - 2
spine-corona/data/raptor-pro.json


+ 10 - 3
spine-corona/data/spineboy-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "K7oDNcMxrFpZQBcQZLCdAEjLad8", "spine": "3.6.32", "width": 470.72, "height": 731.57, "images": "./images/" },
+"skeleton": {
+	"hash": "0DoQUqP6ATLL322RHY3r98lgFr8",
+	"spine": "3.7.08-beta",
+	"width": 470.72,
+	"height": 731.57,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "dust", "parent": "root", "x": -303.6, "y": 32.64, "scaleX": 1.457 },
@@ -1095,10 +1102,10 @@
 					{ "time": 0, "color": "ffffff1e" },
 					{ "time": 0.0333, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.1667, "color": "ffffff00" },
-					{ "time": 0.2, "color": "fffffffe" },
+					{ "time": 0.2, "color": "ffffffff" },
 					{ "time": 0.4667, "color": "ffffff00", "curve": "stepped" },
 					{ "time": 0.5333, "color": "ffffff00" },
-					{ "time": 0.5667, "color": "fffffffe" },
+					{ "time": 0.5667, "color": "ffffffff" },
 					{ "time": 0.8, "color": "ffffff1e" }
 				],
 				"attachment": [

File diff suppressed because it is too large
+ 10 - 3
spine-corona/data/stretchyman-pro.json


+ 178 - 171
spine-corona/data/tank-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "gMeaUupgVoo14IkopUhIqYGpDOU", "spine": "3.6.32", "width": 7202.61, "height": 1298.88, "images": "./images/" },
+"skeleton": {
+	"hash": "JWZpG/bZaODL9WMrHd/eWznhkD0",
+	"spine": "3.7.08-beta",
+	"width": 7202.61,
+	"height": 1298.88,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "tank-root", "parent": "root", "y": 146.79 },
@@ -755,7 +762,7 @@
 			"antenna": {
 				"type": "mesh",
 				"uvs": [ 0.64286, 0.07876, 0.65354, 0.1535, 0.66325, 0.22138, 0.67367, 0.29433, 0.68383, 0.36543, 0.6936, 0.43374, 0.70311, 0.5003, 0.71311, 0.57031, 0.72327, 0.64139, 0.73406, 0.71689, 0.74441, 0.7893, 0.75614, 0.87141, 0.76905, 0.94311, 1, 0.94311, 1, 1, 0, 1, 0, 0.94311, 0.20106, 0.94311, 0.20106, 0.87094, 0.21461, 0.78847, 0.22651, 0.71607, 0.23886, 0.64099, 0.25036, 0.57105, 0.26206, 0.49983, 0.27306, 0.43291, 0.2843, 0.36454, 0.29593, 0.29382, 0.308, 0.22038, 0.319, 0.15345, 0.33142, 0.07796, 0.34423, 0, 0.63161, 0 ],
-				"triangles": [ 29, 0, 1, 29, 30, 0, 30, 31, 0, 27, 2, 3, 27, 28, 2, 28, 1, 2, 28, 29, 1, 26, 27, 3, 25, 4, 5, 25, 26, 4, 26, 3, 4, 24, 25, 5, 7, 23, 6, 23, 24, 6, 24, 5, 6, 7, 22, 23, 21, 8, 9, 21, 22, 8, 22, 7, 8, 20, 21, 9, 19, 20, 10, 20, 9, 10, 14, 15, 12, 15, 17, 12, 12, 13, 14, 15, 16, 17, 17, 11, 12, 17, 18, 11, 18, 19, 11, 19, 10, 11 ],
+				"triangles": [ 30, 31, 0, 29, 30, 0, 29, 0, 1, 28, 29, 1, 28, 1, 2, 27, 28, 2, 27, 2, 3, 26, 3, 4, 25, 26, 4, 25, 4, 5, 26, 27, 3, 24, 5, 6, 23, 24, 6, 7, 23, 6, 24, 25, 5, 22, 7, 8, 21, 22, 8, 21, 8, 9, 7, 22, 23, 20, 9, 10, 19, 20, 10, 20, 21, 9, 19, 10, 11, 18, 19, 11, 17, 18, 11, 17, 11, 12, 15, 16, 17, 12, 13, 14, 15, 17, 12, 14, 15, 12 ],
 				"vertices": [ 2, 10, 65.38, -3.14, 0.3125, 11, 23.38, -3.14, 0.6875, 2, 10, 42.73, -3.38, 0.66667, 11, 0.73, -3.38, 0.33333, 2, 9, 64.17, -3.59, 0.33333, 10, 22.17, -3.59, 0.66667, 2, 9, 42.06, -3.82, 0.66667, 10, 0.06, -3.82, 0.33333, 2, 8, 62.52, -4.04, 0.33333, 9, 20.52, -4.04, 0.66667, 2, 8, 41.82, -4.26, 0.66667, 9, -0.18, -4.26, 0.33333, 2, 7, 63.65, -4.47, 0.33333, 8, 21.65, -4.47, 0.66667, 2, 7, 42.44, -4.69, 0.66667, 8, 0.44, -4.69, 0.33333, 2, 6, 62.9, -4.91, 0.33333, 7, 20.9, -4.91, 0.66667, 2, 6, 40.03, -5.15, 0.66667, 7, -1.97, -5.15, 0.33333, 2, 5, 5.38, 58.09, 0.4, 6, 18.09, -5.38, 0.6, 1, 5, 5.64, 33.21, 1, 1, 5, 5.92, 11.48, 1, 1, 5, 11, 11.48, 1, 1, 5, 11, -5.76, 1, 1, 5, -11, -5.76, 1, 1, 5, -11, 11.48, 1, 1, 5, -6.58, 11.48, 1, 1, 5, -6.58, 33.35, 1, 2, 5, -6.28, 58.34, 0.4, 6, 18.34, 6.28, 0.6, 2, 6, 40.27, 6.02, 0.66667, 7, -1.73, 6.02, 0.33333, 2, 6, 63.03, 5.75, 0.33333, 7, 21.03, 5.75, 0.66667, 2, 7, 42.22, 5.49, 0.66667, 8, 0.22, 5.49, 0.33333, 2, 7, 63.8, 5.23, 0.33333, 8, 21.8, 5.23, 0.66667, 2, 8, 42.07, 4.99, 0.66667, 9, 0.07, 4.99, 0.33333, 2, 8, 62.79, 4.75, 0.33333, 9, 20.79, 4.75, 0.66667, 2, 9, 42.22, 4.49, 0.66667, 10, 0.22, 4.49, 0.33333, 2, 9, 64.47, 4.22, 0.33333, 10, 22.47, 4.22, 0.66667, 2, 10, 42.75, 3.98, 0.66667, 11, 0.75, 3.98, 0.33333, 2, 10, 65.62, 3.71, 0.3125, 11, 23.62, 3.71, 0.6875, 1, 11, 47.24, 3.43, 1, 1, 11, 47.24, -2.9, 1 ],
 				"hull": 32,
 				"edges": [ 28, 30, 28, 26, 30, 32, 26, 24, 24, 22, 32, 34, 34, 24, 34, 36, 36, 22, 60, 62, 38, 36, 20, 22, 38, 20, 40, 38, 18, 20, 40, 18, 42, 40, 16, 18, 42, 16, 44, 42, 14, 16, 44, 14, 46, 44, 12, 14, 46, 12, 48, 46, 10, 12, 48, 10, 50, 48, 8, 10, 50, 8, 52, 50, 6, 8, 52, 6, 54, 52, 4, 6, 54, 4, 56, 54, 2, 4, 56, 2, 60, 58, 58, 56, 62, 0, 0, 2, 58, 0 ],
@@ -773,7 +780,7 @@
 			"cannon-connector": {
 				"type": "mesh",
 				"uvs": [ 1, 0.03237, 1, 0.10603, 0.90988, 0.32859, 0.81975, 0.55116, 0.72963, 0.77373, 0.6395, 0.9963, 0.42157, 0.9963, 0.20364, 0.9963, 0, 0.85434, 0, 0.69902, 0.02268, 0.52884, 0, 0.31444, 0.21602, 0.12998, 0.43368, 0, 0.63547, 0.0037, 0.48408, 0.77059, 0.31496, 0.52497, 0.64133, 0.19648, 0.21516, 0.76766, 0.58346, 0.56471, 0.68444, 0.40146, 0.46758, 0.36649, 0.28935, 0.34604 ],
-				"triangles": [ 7, 18, 6, 6, 18, 15, 7, 8, 18, 8, 9, 18, 18, 16, 15, 15, 16, 19, 9, 10, 18, 18, 10, 16, 16, 21, 19, 19, 21, 20, 10, 22, 16, 10, 11, 22, 16, 22, 21, 21, 17, 20, 21, 12, 13, 17, 13, 14, 17, 21, 13, 11, 12, 22, 21, 22, 12, 6, 15, 5, 5, 15, 4, 15, 19, 4, 4, 19, 3, 19, 20, 3, 3, 20, 2, 20, 17, 2, 2, 17, 1, 17, 14, 1, 14, 0, 1 ],
+				"triangles": [ 21, 22, 12, 11, 12, 22, 17, 21, 13, 17, 13, 14, 21, 12, 13, 21, 17, 20, 16, 22, 21, 10, 11, 22, 10, 22, 16, 19, 21, 20, 16, 21, 19, 18, 10, 16, 9, 10, 18, 15, 16, 19, 18, 16, 15, 8, 9, 18, 7, 8, 18, 6, 18, 15, 7, 18, 6, 14, 0, 1, 17, 14, 1, 2, 17, 1, 20, 17, 2, 3, 20, 2, 19, 20, 3, 4, 19, 3, 15, 19, 4, 5, 15, 4, 6, 15, 5 ],
 				"vertices": [ 1, 12, 35.91, 69.08, 1, 1, 12, 35.91, 59.14, 1, 1, 12, 25.82, 29.09, 1, 1, 12, 15.72, -0.95, 1, 1, 12, 5.63, -31, 1, 1, 12, -4.46, -61.05, 1, 2, 12, -28.87, -61.05, 0.33333, 14, 28.87, 61.03, 0.66667, 1, 14, 53.28, 61.02, 1, 1, 14, 76.09, 41.84, 1, 1, 14, 71.17, 21.63, 1, 1, 14, 72.83, -1.62, 1, 1, 14, 70.38, -29.12, 1, 1, 14, 50.67, -56.14, 1, 2, 12, -28.43, 74.38, 0.41, 14, 28.43, -74.4, 0.59, 2, 12, -4.92, 72.95, 0.52, 14, 4.92, -72.95, 0.48, 2, 12, -21.87, -30.58, 0.49, 14, 21.87, 30.57, 0.51, 1, 14, 40.81, -2.6, 1, 2, 12, -4.26, 46.93, 0.49, 14, 4.26, -46.93, 0.51, 1, 14, 51.99, 30.15, 1, 2, 12, -10.74, -2.78, 0.49, 14, 10.74, 2.78, 0.51, 2, 12, 0.57, 19.25, 0.49, 14, -0.57, -19.25, 0.51, 1, 14, 23.72, -23.99, 1, 1, 14, 43.68, -26.76, 1 ],
 				"hull": 15,
 				"edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 0 ],
@@ -2241,7 +2248,7 @@
 			},
 			"smoke-glow": {
 				"color": [
-					{ "time": 0.1333, "color": "fffffffe" },
+					{ "time": 0.1333, "color": "ffffffff" },
 					{ "time": 0.1667, "color": "ffbc8af4" },
 					{ "time": 0.2, "color": "fc8e8e90" },
 					{ "time": 0.2667, "color": "fa3e3e1e" }
@@ -2253,9 +2260,9 @@
 			},
 			"smoke-puff1-bg": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1.0333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2264,9 +2271,9 @@
 			},
 			"smoke-puff1-bg2": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2275,9 +2282,9 @@
 			},
 			"smoke-puff1-bg3": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2286,9 +2293,9 @@
 			},
 			"smoke-puff1-bg4": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2297,9 +2304,9 @@
 			},
 			"smoke-puff1-bg5": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2308,9 +2315,9 @@
 			},
 			"smoke-puff1-bg6": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2319,9 +2326,9 @@
 			},
 			"smoke-puff1-bg7": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2330,9 +2337,9 @@
 			},
 			"smoke-puff1-bg8": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2341,9 +2348,9 @@
 			},
 			"smoke-puff1-bg9": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2352,9 +2359,9 @@
 			},
 			"smoke-puff1-bg10": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2363,8 +2370,8 @@
 			},
 			"smoke-puff1-bg11": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.1333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2373,8 +2380,8 @@
 			},
 			"smoke-puff1-bg12": {
 				"twoColor": [
-					{ "time": 0.3333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8667, "light": "ffd50c00", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2383,8 +2390,8 @@
 			},
 			"smoke-puff1-bg13": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3667, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2393,8 +2400,8 @@
 			},
 			"smoke-puff1-bg14": {
 				"twoColor": [
-					{ "time": 0.4333, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1.0667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2403,8 +2410,8 @@
 			},
 			"smoke-puff1-bg15": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2413,8 +2420,8 @@
 			},
 			"smoke-puff1-bg16": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2423,9 +2430,9 @@
 			},
 			"smoke-puff1-bg17": {
 				"twoColor": [
-					{ "time": 0.2333, "light": "ffd50cfe", "dark": "534035" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.2333, "light": "ffd50cff", "dark": "534035" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.6667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2434,9 +2441,9 @@
 			},
 			"smoke-puff1-bg18": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2445,9 +2452,9 @@
 			},
 			"smoke-puff1-bg20": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2456,25 +2463,25 @@
 			},
 			"smoke-puff1-bg21": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				]
 			},
 			"smoke-puff1-bg22": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				]
 			},
 			"smoke-puff1-bg23": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffd50cfe", "dark": "3b2c23" },
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.5, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.5, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7667, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2483,8 +2490,8 @@
 			},
 			"smoke-puff1-bg24": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2493,8 +2500,8 @@
 			},
 			"smoke-puff1-bg25": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2503,8 +2510,8 @@
 			},
 			"smoke-puff1-bg26": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.6, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2513,8 +2520,8 @@
 			},
 			"smoke-puff1-bg27": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ffd50cfe", "dark": "604b3f", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ffd50cfe", "dark": "604b3f" },
+					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7333, "light": "ffd50c00", "dark": "604b3f" }
 				],
 				"attachment": [
@@ -2523,12 +2530,12 @@
 			},
 			"smoke-puff1-fg": {
 				"twoColor": [
-					{ "time": 0.0667, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1333, "light": "fde252fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.0667, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1333, "light": "fde252ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1.0333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2540,11 +2547,11 @@
 			},
 			"smoke-puff1-fg2": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2556,11 +2563,11 @@
 			},
 			"smoke-puff1-fg3": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffe457fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffe457ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2572,11 +2579,11 @@
 			},
 			"smoke-puff1-fg4": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "fae781fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "fae781ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2588,11 +2595,11 @@
 			},
 			"smoke-puff1-fg5": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2604,11 +2611,11 @@
 			},
 			"smoke-puff1-fg6": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2620,11 +2627,11 @@
 			},
 			"smoke-puff1-fg7": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2636,11 +2643,11 @@
 			},
 			"smoke-puff1-fg8": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2652,11 +2659,11 @@
 			},
 			"smoke-puff1-fg9": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2668,11 +2675,11 @@
 			},
 			"smoke-puff1-fg10": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "fce35dfe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5333, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "fce35dff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5333, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2684,8 +2691,8 @@
 			},
 			"smoke-puff1-fg11": {
 				"twoColor": [
-					{ "time": 0.3333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2694,8 +2701,8 @@
 			},
 			"smoke-puff1-fg12": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3667, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8667, "light": "ac8c7500", "dark": "604a3f" }
 				],
 				"attachment": [
@@ -2704,8 +2711,8 @@
 			},
 			"smoke-puff1-fg13": {
 				"twoColor": [
-					{ "time": 0.3667, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3667, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2714,8 +2721,8 @@
 			},
 			"smoke-puff1-fg14": {
 				"twoColor": [
-					{ "time": 0.4333, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1.0667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2724,8 +2731,8 @@
 			},
 			"smoke-puff1-fg15": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2734,8 +2741,8 @@
 			},
 			"smoke-puff1-fg16": {
 				"twoColor": [
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2744,9 +2751,9 @@
 			},
 			"smoke-puff1-fg17": {
 				"twoColor": [
-					{ "time": 0.2333, "light": "e3c05efe", "dark": "ab7e59" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.2333, "light": "e3c05eff", "dark": "ab7e59" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.6667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2755,11 +2762,11 @@
 			},
 			"smoke-puff1-fg18": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2769,11 +2776,11 @@
 			},
 			"smoke-puff1-fg20": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2782,31 +2789,31 @@
 			},
 			"smoke-puff1-fg21": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				]
 			},
 			"smoke-puff1-fg22": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				]
 			},
 			"smoke-puff1-fg23": {
 				"twoColor": [
-					{ "time": 0.1333, "light": "ffdf31fe", "dark": "ff0000" },
-					{ "time": 0.1667, "light": "ffe568fe", "dark": "e26425" },
-					{ "time": 0.2, "light": "ffe568fe", "dark": "ab774c" },
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.5, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
+					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
+					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.5, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2815,8 +2822,8 @@
 			},
 			"smoke-puff1-fg24": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2825,8 +2832,8 @@
 			},
 			"smoke-puff1-fg25": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2835,8 +2842,8 @@
 			},
 			"smoke-puff1-fg26": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.6, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [
@@ -2845,8 +2852,8 @@
 			},
 			"smoke-puff1-fg27": {
 				"twoColor": [
-					{ "time": 0.3, "light": "ab764cfe", "dark": "ac8d75", "curve": "stepped" },
-					{ "time": 0.4667, "light": "ab764cfe", "dark": "ac8d75" },
+					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
+					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7333, "light": "ab764c00", "dark": "ac8d75" }
 				],
 				"attachment": [

File diff suppressed because it is too large
+ 9 - 2
spine-corona/data/vine-pro.json


+ 8 - 1
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "V6g6Wb9jzPmhtOSXWRntImZ1WtU", "spine": "3.6.32", "width": 234.03, "height": 354.91, "images": "./images/" },
+"skeleton": {
+	"hash": "2ZytXk25WMQh7xfYd6gBJKXviEA",
+	"spine": "3.7.08-beta",
+	"width": 234.03,
+	"height": 354.91,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41, "color": "ffd300ff" },

BIN
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-ess.skel


+ 9 - 2
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.json

@@ -1,5 +1,12 @@
 {
-"skeleton": { "hash": "zpNuAPL6j4bcbent5j8BOpZlfdA", "spine": "3.6.32", "width": 266.94, "height": 349.61, "images": "./images/" },
+"skeleton": {
+	"hash": "GEt0/K+46aqD75ngNEZOztV899k",
+	"spine": "3.7.08-beta",
+	"width": 266.94,
+	"height": 349.61,
+	"images": "./images/",
+	"audio": ""
+},
 "bones": [
 	{ "name": "root" },
 	{ "name": "hip", "parent": "root", "x": 0.65, "y": 114.41, "color": "ffcf00ff" },
@@ -87,7 +94,7 @@
 			"spear": {
 				"type": "mesh",
 				"uvs": [ 1, 0.11236, 0.77096, 0.13278, 0.76608, 0.21781, 0.75642, 0.386, 0.74723, 0.54607, 0.72117, 1, 0.28838, 1, 0.24208, 0.54328, 0.2259, 0.38362, 0.20891, 0.21605, 0.20043, 0.13243, 0, 0.1152, 0.4527, 0, 0.58399, 0 ],
-				"triangles": [ 5, 6, 4, 6, 7, 4, 4, 7, 3, 2, 9, 1, 9, 10, 1, 10, 12, 1, 12, 13, 1, 1, 13, 0, 10, 11, 12, 3, 8, 2, 8, 9, 2, 7, 8, 3 ],
+				"triangles": [ 4, 7, 3, 6, 7, 4, 5, 6, 4, 10, 11, 12, 1, 13, 0, 12, 13, 1, 10, 12, 1, 9, 10, 1, 2, 9, 1, 8, 9, 2, 3, 8, 2, 7, 8, 3 ],
 				"vertices": [ 1, 20, 38.54, -10.89, 1, 1, 20, 30.97, -5.93, 1, 2, 19, 61.48, -5.59, 0.5116, 20, -0.31, -6.16, 0.4884, 2, 18, 64.73, -5.03, 0.50272, 19, -0.4, -5.07, 0.49728, 1, 10, 4.57, 23.91, 1, 1, 10, 41.7, -138.95, 1, 1, 10, 32.43, -141.1, 1, 1, 10, -6.49, 22.41, 1, 2, 18, 65.48, 6.65, 0.50272, 19, 0.53, 6.6, 0.49728, 2, 19, 62.19, 6.67, 0.5116, 20, 0.2, 6.1, 0.4884, 1, 20, 30.97, 6.62, 1, 1, 20, 37.26, 11.09, 1, 1, 20, 79.75, 1.6, 1, 1, 20, 79.78, -1.29, 1 ],
 				"hull": 14,
 				"edges": [ 24, 22, 22, 20, 10, 12, 2, 0, 24, 26, 0, 26, 8, 10, 12, 14, 6, 8, 14, 16, 2, 4, 4, 6, 16, 18, 18, 20, 20, 2 ],

BIN
spine-libgdx/spine-libgdx-tests/assets/goblins/goblins-pro.skel


File diff suppressed because it is too large
+ 9 - 2
spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.json


BIN
spine-libgdx/spine-libgdx-tests/assets/raptor/raptor-pro.skel


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