From 337e8346e6f6fff43cda01ed6ed91031237abcad Mon Sep 17 00:00:00 2001 From: zhangbin Date: Fri, 6 Jan 2017 18:00:28 +0800 Subject: [PATCH] Solve the error effect of DragonBones when re-enter an auto-released scene. --- extensions/dragonbones/ArmatureDisplay.js | 22 ++++++++++++++++++++-- extensions/dragonbones/CCSlot.js | 3 ++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js index 98e0c1d5c9..57e5f09b26 100644 --- a/extensions/dragonbones/ArmatureDisplay.js +++ b/extensions/dragonbones/ArmatureDisplay.js @@ -341,8 +341,26 @@ dragonBones.ArmatureDisplay = cc.Class({ this._factory.parseTextureAtlasData(this.dragonAtlasAsset.atlasJson, this.dragonAtlasAsset.texture); } else { var atlasJsonObj = JSON.parse(this.dragonAtlasAsset.atlasJson); - var texture = cc.textureCache.getTextureForKey(this.dragonAtlasAsset.texture); - this._factory.parseTextureAtlasData(atlasJsonObj, texture); + var atlasName = atlasJsonObj.name; + var existedAtlasData = null; + var atlasDataList = this._factory.getTextureAtlasData(atlasName); + var texturePath = this.dragonAtlasAsset.texture; + if (atlasDataList && atlasDataList.length > 0) { + for (var idx in atlasDataList) { + var data = atlasDataList[idx]; + if (data && data.texture && data.texture.url === texturePath) { + existedAtlasData = data; + break; + } + } + } + + var texture = cc.textureCache.getTextureForKey(texturePath); + if (existedAtlasData) { + existedAtlasData.texture = texture; + } else { + this._factory.parseTextureAtlasData(atlasJsonObj, texture); + } } } }, diff --git a/extensions/dragonbones/CCSlot.js b/extensions/dragonbones/CCSlot.js index 2faab3bb3e..3af061c898 100644 --- a/extensions/dragonbones/CCSlot.js +++ b/extensions/dragonbones/CCSlot.js @@ -129,7 +129,8 @@ dragonBones.CCSlot = cc.Class({ if (currentTextureData) { var textureAtlasTexture = currentTextureData.parent.texture; - if (!currentTextureData.texture && textureAtlasTexture) { + if ((!currentTextureData.texture && textureAtlasTexture) || + (currentDisplayData.texture && textureAtlasTexture && currentTextureData.texture.getTexture() !== textureAtlasTexture)){ // Create and cache texture var rect = cc.rect(currentTextureData.region.x, currentTextureData.region.y, currentTextureData.region.width, currentTextureData.region.height);