Merge branch 'dev' of https://github.com/DragonBones/DragonBonesJS in…

…to dev
DragonBones · Jun 20, 2018 · 6b4692e · 6b4692e
2 parents 84fc000 + d7fb049
commit 6b4692e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/DragonBones/src/dragonBones/animation/AnimationState.ts b/DragonBones/src/dragonBones/animation/AnimationState.ts
@@ -545,7 +545,7 @@ namespace dragonBones {
 
                                     case TimelineType.SlotZIndex: {
                                         const timeline = BaseObject.borrowObject(SlotZIndexTimelineState);
-                                        timeline.target = this._armature.animation.getBlendState(BlendState.SLOT_ALPHA, slot.name, slot);
+                                        timeline.target = this._armature.animation.getBlendState(BlendState.SLOT_Z_INDEX, slot.name, slot);
                                         timeline.init(this._armature, this, timelineData);
                                         this._slotBlendTimelines.push(timeline);
                                         break;
@@ -1543,7 +1543,7 @@ namespace dragonBones {
                             this.layer = animationLayer;
                             this.leftWeight = 0.0;
                             this.blendWeight = 0.0;
-                            
+
                             return false;
                         }
 

diff --git a/DragonBones/src/dragonBones/core/DragonBones.ts b/DragonBones/src/dragonBones/core/DragonBones.ts
@@ -142,9 +142,9 @@ namespace dragonBones {
         BoneTranslate = 11,
         BoneRotate = 12,
         BoneScale = 13,
-        BoneAlpha = 19,
 
         Surface = 50,
+        BoneAlpha = 60,
 
         SlotDisplay = 20,
         SlotColor = 21,