加入3.5 修复水印

js/spine-legacy-binary.js

@@ -1,9 +1,10 @@
 'use strict';
 
-// Adapted from Esoteric Software's 3.4/3.6/3.7 spine-libgdx SkeletonBinary.java.
+// Adapted from Esoteric Software's 3.4/3.5/3.6/3.7 spine-libgdx SkeletonBinary.java.
 // Copyright (c) 2013-2019, Esoteric Software. See
 // LICENSES/Spine-Legacy-Binary-License.txt for the original license notices.
 // 3.4 source and license: LICENSES/Spine-3.4-License.txt.
+// 3.5 source and license: LICENSES/Spine-3.5-License.txt.
 // Decode the versioned wire format to an in-memory SkeletonJson object. The
 // matching runtime builds attachments/timelines and applies loader.scale once.
 
@@ -61,11 +62,12 @@ class Input {
 function decode(bytes, runtimeDir) {
 	const r = new Input(bytes);
 	const skeleton = { hash: r.string(), spine: r.string() };
-	if (!/^3\.[467]\./.test(skeleton.spine || '')) r.fail('仅支持 Spine 3.4 / 3.6 / 3.7');
+	if (!/^3\.[4567]\./.test(skeleton.spine || '')) r.fail('仅支持 Spine 3.4 / 3.5 / 3.6 / 3.7');
 	const version = skeleton.spine.slice(0, 3);
 	if (runtimeDir && version !== runtimeDir) r.fail('骨骼版本与运行时不一致');
 	const v37 = version === '3.7';
 	const v34 = version === '3.4';
+	const before36 = v34 || version === '3.5';
 	skeleton.width = r.float(); skeleton.height = r.float();
 	const nonessential = r.bool();
 	if (nonessential) { if (!v34) skeleton.fps = r.float(); skeleton.images = r.string(); if (v37) skeleton.audio = r.string(); }
@@ -83,7 +85,7 @@ function decode(bytes, runtimeDir) {
 	}
 	for (let i = 0, n = r.count(); i < n; i++) {
 		const s = { name: r.string(), bone: boneName(), color: r.color() };
-		if (!v34) { const dark = r.color(); if (dark !== 'ffffffff') s.dark = dark.slice(2); }
+		if (!before36) { const dark = r.color(); if (dark !== 'ffffffff') s.dark = dark.slice(2); }
 		s.attachment = r.string(); s.blend = r.ref(['normal', 'additive', 'multiply', 'screen']); root.slots.push(s);
 	}
 	for (let i = 0, n = r.count(); i < n; i++) {
@@ -92,7 +94,7 @@ function decode(bytes, runtimeDir) {
 	}
 	for (let i = 0, n = r.count(); i < n; i++) {
 		const c = { name: r.string(), order: v34 ? 0 : r.varint(), bones: boneList(), target: boneName() };
-		if (!v34) { c.local = r.bool(); c.relative = r.bool(); }
+		if (!before36) { c.local = r.bool(); c.relative = r.bool(); }
 		fields(c, 'rotation x y scaleX scaleY shearY rotateMix translateMix scaleMix shearMix'); root.transform.push(c);
 	}
 	for (let i = 0, n = r.count(); i < n; i++) {
@@ -112,7 +114,7 @@ function decode(bytes, runtimeDir) {
 	function attachment(key) {
 		const a = { name: r.string() || key };
 		const type = r.byte();
-		if (v34 && type > 4) r.fail('3.4 不支持此附件类型：' + type);
+		if (before36 && type > 4) r.fail(version + ' 不支持此附件类型：' + type);
 		a.type = ['region', 'boundingbox', 'mesh', 'linkedmesh', 'path', 'point', 'clipping'][type];
 		if (!a.type) r.fail('未知附件类型：' + type);
 		if (type === 0) {
@@ -172,7 +174,7 @@ function decode(bytes, runtimeDir) {
 				const type = r.byte();
 				if (type === 0) timelines.attachment = frames(f => { f.name = r.string(); }, false);
 				else if (type === 1) timelines.color = frames(f => { f.color = r.color(); });
-				else if (type === 2 && !v34) timelines.twoColor = frames(f => { f.light = r.color(); f.dark = r.color().slice(2); });
+				else if (type === 2 && !before36) timelines.twoColor = frames(f => { f.light = r.color(); f.dark = r.color().slice(2); });
 				else r.fail('未知插槽时间线');
 			}
 		}
@@ -233,7 +235,7 @@ function decode(bytes, runtimeDir) {
 }
 
 function install(spine, runtimeDir) {
-	if (!['3.4', '3.6', '3.7'].includes(runtimeDir)) return spine;
+	if (!['3.4', '3.5', '3.6', '3.7'].includes(runtimeDir)) return spine;
 	if (runtimeDir === '3.4') spine.AtlasAttachmentLoader = spine.TextureAtlasAttachmentLoader;
 	spine.SkeletonBinary = class SkeletonBinary {
 		constructor(attachmentLoader) { this.attachmentLoader = attachmentLoader; this.scale = 1; }