From aa41a196d0f7ef780466cf3bdba53ce57ea10c2d Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Mon, 8 Jan 2018 15:51:55 +0800 Subject: [PATCH] fixed child armature display --- extensions/dragonbones/CCFactory.js | 13 ++++++++++--- extensions/dragonbones/CCSlot.js | 2 +- extensions/dragonbones/dragonblones-assembler.js | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/extensions/dragonbones/CCFactory.js b/extensions/dragonbones/CCFactory.js index c5f89c271d..5e92fbba06 100644 --- a/extensions/dragonbones/CCFactory.js +++ b/extensions/dragonbones/CCFactory.js @@ -55,7 +55,9 @@ dragonBones.CCFactory = cc.Class({ display = node.addComponent(dragonBones.ArmatureDisplay); } - node.name = display.armatureName = armatureName; + node.name = armatureName; + + display._armatureName = armatureName; display._N$dragonAsset = comp.dragonAsset; display._N$dragonAtlasAsset = comp.dragonAtlasAsset; display._init(); @@ -66,8 +68,13 @@ dragonBones.CCFactory = cc.Class({ _buildChildArmature (dataPackage, slot, displayData) { let temp = this._display; - let node = new cc.Node(); - let display = this.createArmatureNode(temp, displayData.path); + let name = 'CHILD_ARMATURE-' + displayData.path; + let node = this._display.node.getChildByName(name); + if (!node) { + node = new cc.Node(); + } + let display = this.createArmatureNode(temp, displayData.path, node); + node.name = name; this._display = temp; return display._armature; diff --git a/extensions/dragonbones/CCSlot.js b/extensions/dragonbones/CCSlot.js index 00850011a8..111ef420b6 100644 --- a/extensions/dragonbones/CCSlot.js +++ b/extensions/dragonbones/CCSlot.js @@ -56,7 +56,7 @@ dragonBones.CCSlot = cc.Class({ _onUpdateDisplay () { if (this._childArmature) { - this._childArmature._isChildArmature = true; + this._childArmature.display._isChildArmature = true; } }, diff --git a/extensions/dragonbones/dragonblones-assembler.js b/extensions/dragonbones/dragonblones-assembler.js index 4383a98dfc..4dce25cb02 100644 --- a/extensions/dragonbones/dragonblones-assembler.js +++ b/extensions/dragonbones/dragonblones-assembler.js @@ -52,7 +52,7 @@ let armatureAssembler = js.addon({ this.datas.length = 0; let armature = comp._armature; - if (!armature || armature._isChildArmature) { + if (!armature || comp._isChildArmature) { return this.datas; } @@ -94,7 +94,7 @@ let armatureAssembler = js.addon({ fillBuffers (batchData, vertexId, vbuf, uintbuf, ibuf) { let comp = batchData.comp, armature = batchData.comp._armature; - if (!armature || armature._isChildArmature) return; + if (!armature || comp._isChildArmature) return; _vertexOffset = batchData.vertexOffset * comp._vertexFormat._bytes / 4; _indiceOffset = batchData.indiceOffset;