diff --git a/src/dragonBones/core/DragonBones.as b/src/dragonBones/core/DragonBones.as index 9969dac..54dc52e 100644 --- a/src/dragonBones/core/DragonBones.as +++ b/src/dragonBones/core/DragonBones.as @@ -3,8 +3,8 @@ package dragonBones.core public final class DragonBones { public static const DATA_VERSION:String = "2.3"; - public static const VERSION:String = "2.4"; - public static const VERSION_NUMBER:int = 2400; + public static const VERSION:String = "2.4.1"; + public static const VERSION_NUMBER:int = 2410; public function DragonBones() { diff --git a/src/dragonBones/display/StarlingDisplayBridge.as b/src/dragonBones/display/StarlingDisplayBridge.as index f66ff90..bf077b7 100644 --- a/src/dragonBones/display/StarlingDisplayBridge.as +++ b/src/dragonBones/display/StarlingDisplayBridge.as @@ -40,6 +40,7 @@ } public function set display(value:Object):void { + /* if (_display is Image && value is Image) { var from:Image = _display as Image; @@ -63,6 +64,7 @@ from.readjustSize(); return; } + */ if (_display == value) { @@ -78,6 +80,7 @@ } removeDisplay(); } + /* else if(value is Image && !_imageBackup) { _imageBackup = value as Image; @@ -85,6 +88,7 @@ _pivotXBackup = _imageBackup.pivotX; _pivotYBackup = _imageBackup.pivotY; } + */ _display = value; addDisplay(parent, index); } @@ -198,4 +202,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/dragonBones/factorys/BaseFactory.as b/src/dragonBones/factorys/BaseFactory.as index 003fb88..a247985 100644 --- a/src/dragonBones/factorys/BaseFactory.as +++ b/src/dragonBones/factorys/BaseFactory.as @@ -323,6 +323,12 @@ package dragonBones.factorys } } } + + var armatureDataCopy:ArmatureData = data.getArmatureData(animationName); + if(armatureDataCopy) + { + var skinDataCopy:SkinData = armatureDataCopy.getSkinData(""); + } } if(animationArmatureData) @@ -367,7 +373,21 @@ package dragonBones.factorys switch(displayData.type) { case DisplayData.ARMATURE: - childArmature = buildArmature(displayData.name, null, _currentDataName, _currentTextureAtlasName); + + if(skinDataCopy) + { + var slotDataCopy:SlotData = skinDataCopy.getSlotData(slotData.name); + if(slotDataCopy) + { + var displayDataCopy:DisplayData = slotDataCopy.displayDataList[i]; + } + } + else + { + displayDataCopy = null; + } + + childArmature = buildArmature(displayData.name, displayDataCopy?displayDataCopy.name:null, _currentDataName, _currentTextureAtlasName); if(childArmature) { helpArray[i] = childArmature;