diff --git a/extensions/CocoStudio/Armature/display/CCDisplayManager.js b/extensions/CocoStudio/Armature/display/CCDisplayManager.js index be7992aa46..e2b2dcc27a 100644 --- a/extensions/CocoStudio/Armature/display/CCDisplayManager.js +++ b/extensions/CocoStudio/Armature/display/CCDisplayManager.js @@ -159,6 +159,28 @@ ccs.DisplayManager = ccs.Class.extend({ } this.setCurrentDecorativeDisplay(decoDisplay); }, + changeDisplayByName:function (name, force){ + var decoDisplay; + this._forceChangeDisplay = force; + + for(var index = 0; index < this._decoDisplayList.length;index++){ + var display = this._decoDisplayList[index].getDisplay(); + if( (typeof(display.getDisplayName) != "undefined") && name == this._decoDisplayList[index].getDisplay().getDisplayName()){ + decoDisplay = this._decoDisplayList[index]; + this._displayIndex = index; + break; + } + } + + + if(!decoDisplay){ + return; + } + + + this.setCurrentDecorativeDisplay(decoDisplay); + + }, changeDisplayWithName: function (name, force) { for (var i = 0; i < this._decoDisplayList.length; i++) { diff --git a/extensions/CocoStudio/Reader/SceneReader.js b/extensions/CocoStudio/Reader/SceneReader.js index b4c07e098d..87e9832776 100644 --- a/extensions/CocoStudio/Reader/SceneReader.js +++ b/extensions/CocoStudio/Reader/SceneReader.js @@ -348,25 +348,25 @@ ccs.SceneReader = ccs.Class.extend(/** @lends ccs.SceneReader# */{ * @param {Object} dict */ setPropertyFromJsonDict: function (node, dict) { - var x = dict["x"] || 0; - var y = dict["y"] || 0; + var x = (typeof dict["x"] === 'undefined')?0:dict["x"]; + var y = (typeof dict["y"] === 'undefined')?0:dict["y"]; node.setPosition(cc.p(x, y)); - var bVisible = Boolean(dict["visible"] || 1); + var bVisible = Boolean((typeof dict["visible"] === 'undefined')?1:dict["visible"]); node.setVisible(bVisible); - var nTag = dict["objecttag"] || -1; + var nTag = (typeof dict["objecttag"] === 'undefined')?-1:dict["objecttag"]; node.setTag(nTag); - var nZorder = dict["zorder"] || 0; + var nZorder = (typeof dict["zorder"] === 'undefined')?0:dict["zorder"]; node.setZOrder(nZorder); - var fScaleX = dict["scalex"] || 1; - var fScaleY = dict["scaley"] || 1; + var fScaleX = (typeof dict["scalex"] === 'undefined')?1:dict["scalex"]; + var fScaleY = (typeof dict["scaley"] === 'undefined')?1:dict["scaley"]; node.setScaleX(fScaleX); node.setScaleY(fScaleY); - var fRotationZ = dict["rotation"] || 0; + var fRotationZ = (typeof dict["rotation"] === 'undefined')?0:dict["rotation"]; node.setRotation(fRotationZ); }, setTarget : function(selector,listener){