fix index change bug

DragonBones · Aug 5, 2015 · e0287ee · e0287ee
1 parent deed3aa
commit e0287ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/dragonBones/fast/FastSlot.as b/src/dragonBones/fast/FastSlot.as
@@ -146,7 +146,10 @@ package dragonBones.fast
 					targetArmature.resetAnimation()
 				}
 			}
-
+			if (_isColorChanged)
+			{
+				updateDisplayColor(0, 0, 0, 0, 1, 1, 1, 1, true);
+			}
 			var slotIndex:int = getDisplayIndex();
 			removeDisplayFromContainer();
 			return slotIndex;

diff --git a/src/dragonBones/objects/Object3DataParser.as b/src/dragonBones/objects/Object3DataParser.as
@@ -508,10 +508,10 @@ package dragonBones.objects
 					colorTransform.greenOffset = int(colorTransformObject[ConstValues.A_GREEN_OFFSET]);
 					colorTransform.blueOffset = int(colorTransformObject[ConstValues.A_BLUE_OFFSET]);
 
-					colorTransform.alphaMultiplier = int(getNumber(colorTransformObject, ConstValues.A_ALPHA_MULTIPLIER,100)||100) * 0.01;
-					colorTransform.redMultiplier = int(getNumber(colorTransformObject,ConstValues.A_RED_MULTIPLIER,100)||100) * 0.01;
-					colorTransform.greenMultiplier = int(getNumber(colorTransformObject,ConstValues.A_GREEN_MULTIPLIER,100)||100) * 0.01;
-					colorTransform.blueMultiplier = int(getNumber(colorTransformObject,ConstValues.A_BLUE_MULTIPLIER,100)||100) * 0.01;
+					colorTransform.alphaMultiplier = int(getNumber(colorTransformObject, ConstValues.A_ALPHA_MULTIPLIER,100)) * 0.01;
+					colorTransform.redMultiplier = int(getNumber(colorTransformObject,ConstValues.A_RED_MULTIPLIER,100)) * 0.01;
+					colorTransform.greenMultiplier = int(getNumber(colorTransformObject,ConstValues.A_GREEN_MULTIPLIER,100)) * 0.01;
+					colorTransform.blueMultiplier = int(getNumber(colorTransformObject,ConstValues.A_BLUE_MULTIPLIER,100)) * 0.01;
 				}
 			}
 		}

diff --git a/src/dragonBones/objects/ObjectDataParser.as b/src/dragonBones/objects/ObjectDataParser.as
@@ -435,10 +435,10 @@
 					colorTransform.greenOffset = int(colorTransformObject[ConstValues.A_GREEN_OFFSET]);
 					colorTransform.blueOffset = int(colorTransformObject[ConstValues.A_BLUE_OFFSET]);
 
-					colorTransform.alphaMultiplier = int(getNumber(colorTransformObject, ConstValues.A_ALPHA_MULTIPLIER,100)||0) * 0.01;
-					colorTransform.redMultiplier = int(getNumber(colorTransformObject,ConstValues.A_RED_MULTIPLIER,100)||0) * 0.01;
-					colorTransform.greenMultiplier = int(getNumber(colorTransformObject,ConstValues.A_GREEN_MULTIPLIER,100)||0) * 0.01;
-					colorTransform.blueMultiplier = int(getNumber(colorTransformObject,ConstValues.A_BLUE_MULTIPLIER,100)||0) * 0.01;
+					colorTransform.alphaMultiplier = int(getNumber(colorTransformObject, ConstValues.A_ALPHA_MULTIPLIER,100)) * 0.01;
+					colorTransform.redMultiplier = int(getNumber(colorTransformObject,ConstValues.A_RED_MULTIPLIER,100)) * 0.01;
+					colorTransform.greenMultiplier = int(getNumber(colorTransformObject,ConstValues.A_GREEN_MULTIPLIER,100)) * 0.01;
+					colorTransform.blueMultiplier = int(getNumber(colorTransformObject,ConstValues.A_BLUE_MULTIPLIER,100)) * 0.01;
 				}
 			}
 		}