From 29fc50c2c52fb5056d3aeeecc0a604fc3d5ac3d4 Mon Sep 17 00:00:00 2001 From: zhangbin Date: Mon, 16 Jan 2017 13:34:21 +0800 Subject: [PATCH] Solve the error node order when reopen scene in Editor. --- cocos2d/tilemap/CCTiledMap.js | 41 +++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/cocos2d/tilemap/CCTiledMap.js b/cocos2d/tilemap/CCTiledMap.js index 2446befab4..9d6d264c34 100644 --- a/cocos2d/tilemap/CCTiledMap.js +++ b/cocos2d/tilemap/CCTiledMap.js @@ -700,8 +700,6 @@ var TiledMap = cc.Class({ addedLayer._replaceSgNode(sgLayer); node.setSiblingIndex(sgLayer.getLocalZOrder()); node.setAnchorPoint(this.node.getAnchorPoint()); - } else { - existedLayers[theIndex].setSiblingIndex(sgLayer.getLocalZOrder()); } } @@ -737,8 +735,43 @@ var TiledMap = cc.Class({ node.setSiblingIndex(sgGroup.getLocalZOrder()); node.setAnchorPoint(this.node.getAnchorPoint()); addedGroup.enabled = sgGroup.isVisible(); - } else { - existedGroups[theIndex].setSiblingIndex(sgGroup.getLocalZOrder()); + } + } + + // get the current layer & group node names in order + var curChildren = this.node.getChildren(); + var curLayerNames = []; + for (i = 0, n = curChildren.length; i < n; i++) { + child = curChildren[i]; + tmxLayer = child.getComponent(cc.TiledLayer); + tmxGroup = child.getComponent(cc.TiledObjectGroup); + if (tmxLayer || tmxGroup) { + curLayerNames.push(child._name); + } + } + + // get the current layer & group sgNode names in order + var sgLayerNames = []; + var sgLayers = []; + var sgChildren = this._sgNode.getChildren(); + for (i = 0, n = sgChildren.length; i < n; i++) { + child = sgChildren[i]; + if (child instanceof _ccsg.TMXLayer) { + sgLayerNames.push(child.getLayerName()); + sgLayers.push(child); + } + + if (child instanceof _ccsg.TMXObjectGroup) { + sgLayerNames.push(child.getGroupName()); + sgLayers.push(child); + } + } + for (i = sgLayerNames.length - 1; i >= 0; i--) { + var curName = sgLayerNames[i]; + var nodeIdx = curLayerNames.indexOf(curName); + if (i !== nodeIdx) { + var curNode = this.node.getChildByName(curName); + curNode.setSiblingIndex(sgLayers[i].getLocalZOrder()); } }