Merge pull request cocos#1162 from natural-law/solve-example-error

Solve the error effect of TiledMap example on native.
foreverlei · Sep 30, 2016 · 97be55e · 97be55e
2 parents a81471b + 5e58a29
commit 97be55e
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/cocos2d/core/components/CCRendererInSG.js b/cocos2d/core/components/CCRendererInSG.js
@@ -52,7 +52,7 @@ var RendererInSG = cc.Class({
             sgNode.retain();
         }
 
-        // The replacement node used when this component disabled 
+        // The replacement node used when this component disabled
         this._plainNode = new _ccsg.Node();
         if (CC_JSB) {
             this._plainNode.retain();
@@ -107,9 +107,9 @@ var RendererInSG = cc.Class({
             cc.warn('The same sgNode');
             return;
         }
-        
+
         // rebuild scene graph
-        
+
         // replace children
         var children = replaced.getChildren().slice();
         replaced.removeAllChildren(false);
@@ -122,7 +122,7 @@ var RendererInSG = cc.Class({
         for (var i = 0, len = children.length; i < len; ++i) {
             sgNode.addChild(children[i]);
         }
-        
+
         // replace parent
         var parentNode = replaced.getParent();
         if (parentNode) {
@@ -131,6 +131,16 @@ var RendererInSG = cc.Class({
             if ( !CC_JSB ) {
                 sgNode._arrivalOrder = replaced._arrivalOrder;
                 cc.renderer.childrenOrderDirty = parentNode._reorderChildDirty = true;
+            } else {
+                // update the arrival order of replaced sgNode
+                var parentEntity = this.node._parent;
+                if (parentEntity) {
+                    var entityChildren = parentEntity._children;
+                    var startIdx = this.node.getSiblingIndex();
+                    for (i = startIdx + 1; i < entityChildren.length; i++) {
+                        entityChildren[i]._sgNode.updateOrderOfArrival();
+                    }
+                }
             }
         }
         // replaced.release();