Fixed #4051: cc.TMXLayer.removeChild's bug has been fixed.

Author: dingpinglv

cocos2d/core/sprite_nodes/CCSpriteBatchNode.js

@@ -86,7 +86,8 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
             for (var index = 0; index < locDescendants.length; index++) {
                 var obj = locDescendants[index];
                 if (obj && (obj.getAtlasIndex() >= z))
-                    ++i;
+                    break;
+                ++i;
             }
         }
         this._descendants = cc.ArrayAppendObjectToIndex(locDescendants, child, i);
@@ -703,50 +704,53 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
 
     _removeSpriteFromAtlasForCanvas:function (sprite) {
         // Cleanup sprite. It might be reused (issue #569)
-        var delIndex = sprite.getAtlasIndex();
         sprite.setBatchNode(null);
         var locDescendants = this._descendants;
         var index = cc.ArrayGetIndexOfObject(locDescendants, sprite);
-        if (index != -1)
+        if (index != -1) {
             cc.ArrayRemoveObjectAtIndex(locDescendants, index);
-        var curChildren = this._children, i, selSprite;
-        for(i = 0; i < curChildren.length; i++){
-            selSprite = curChildren[i];
-            if(selSprite.getAtlasIndex() > delIndex)
-                selSprite.setAtlasIndex(selSprite.getAtlasIndex() - 1);
+
+            // update all sprites beyond this one
+            var len = locDescendants.length;
+            for (; index < len; ++index) {
+                var s = locDescendants[index];
+                s.setAtlasIndex(s.getAtlasIndex() - 1);
+            }
         }
 
         // remove children recursively
         var children = sprite.getChildren();
         if (children && children.length > 0) {
-            for (i = 0; i < children.length; i++)
+            for (var i = 0; i < children.length; i++)
                 if (children[i])
                     this.removeSpriteFromAtlas(children[i]);
         }
     },
 
     _removeSpriteFromAtlasForWebGL:function (sprite) {
-        var delIndex = sprite.getAtlasIndex();
         this._textureAtlas.removeQuadAtIndex(sprite.getAtlasIndex());   // remove from TextureAtlas
 
         // Cleanup sprite. It might be reused (issue #569)
         sprite.setBatchNode(null);
 
         var locDescendants = this._descendants;
         var index = cc.ArrayGetIndexOfObject(locDescendants, sprite);
-        if (index != -1)
+        if (index != -1) {
             cc.ArrayRemoveObjectAtIndex(locDescendants, index);
-        var curChildren = this._children, i, selSprite;
-        for(i = 0; i < curChildren.length; i++){
-            selSprite = curChildren[i];
-            if(selSprite.getAtlasIndex() > delIndex)
-                selSprite.setAtlasIndex(selSprite.getAtlasIndex() - 1);
+
+            // update all sprites beyond this one
+
+            var len = locDescendants.length;
+            for (; index < len; ++index) {
+                var s = locDescendants[index];
+                s.setAtlasIndex(s.getAtlasIndex() - 1);
+            }
         }
 
         // remove children recursively
         var children = sprite.getChildren();
         if (children && children.length > 0) {
-            for (i = 0; i < children.length; i++)
+            for (var i = 0; i < children.length; i++)
                 if (children[i])
                     this.removeSpriteFromAtlas(children[i]);
         }