Merge pull request #1 from feijing566/master

[dragonBones] Determine whether there is a new armature
cocos · Sep 27, 2017 · e0468ff · e0468ff
2 parents 3910706 + 3f63f50
commit e0468ff
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js
@@ -333,7 +333,20 @@ dragonBones.ArmatureDisplay = cc.Class({
             var jsonObj = JSON.parse(this.dragonAsset.dragonBonesJson);
             var data = this._factory.getDragonBonesData(jsonObj.name);
             if (data) {
-                // already added asset
+                var armature,dragonBonesData;
+                for (var i=0,length = jsonObj.armature.length;i<length;i++) {
+                    armature = jsonObj.armature[i];
+                    if (!data.armatures[armature.name]) {
+                        if (!dragonBonesData) {//add new armature
+                            if (CC_JSB) {
+                                dragonBonesData = this._factory._dataParser.parseDragonBonesData(this.dragonAsset.dragonBonesJson);
+                            } else {
+                                dragonBonesData = this._factory._dataParser.parseDragonBonesData(jsonObj);
+                            }
+                        }
+                        data.addArmature(dragonBonesData.armatures[armature.name]);
+                    }
+                }
                 this._dragonBonesData = data;
                 return;
             }