diff --git a/extensions/CocoStudio/Action/CCActionManager.js b/extensions/CocoStudio/Action/CCActionManager.js index 5aad016a33..b031eca3fb 100644 --- a/extensions/CocoStudio/Action/CCActionManager.js +++ b/extensions/CocoStudio/Action/CCActionManager.js @@ -78,11 +78,12 @@ ccs.ActionManager = ccs.Class.extend(/** @lends ccs.ActionManager# */{ * Play an Action with a name. * @param {String} jsonName * @param {String} actionName + * @param {cc.CallFunc} fun */ - playActionByName: function (jsonName, actionName) { + playActionByName: function (jsonName, actionName, fun) { var action = this.getActionByName(jsonName, actionName); if (action) { - action.play(); + action.play(fun); } }, diff --git a/extensions/CocoStudio/Action/CCActionNode.js b/extensions/CocoStudio/Action/CCActionNode.js index 44d83928db..734069ad06 100644 --- a/extensions/CocoStudio/Action/CCActionNode.js +++ b/extensions/CocoStudio/Action/CCActionNode.js @@ -279,13 +279,17 @@ ccs.ActionNode = ccs.Class.extend({ /** * Play the action. * @param {Boolean} loop + * @param {cc.CallFunc} fun */ - playAction: function () { + playAction: function (fun) { if (this._object == null || this._actionSpawn == null) { return; } - this._action = cc.Sequence.create(this._actionSpawn, null); - this._action.retain(); + if(fun){ + this._action = cc.Sequence.create(this._actionSpawn,fun); + }else{ + this._action = cc.Sequence.create(this._actionSpawn); + } this.runAction(); }, diff --git a/extensions/CocoStudio/Action/CCActionObject.js b/extensions/CocoStudio/Action/CCActionObject.js index 09acd7edda..cd25359425 100644 --- a/extensions/CocoStudio/Action/CCActionObject.js +++ b/extensions/CocoStudio/Action/CCActionObject.js @@ -170,18 +170,19 @@ ccs.ActionObject = ccs.Class.extend({ /** * Play the action. + * @param {cc.CallFunc} fun */ - play: function () { + play: function (fun) { this.stop(); this.updateToFrameByTime(0); var frameNum = this._actionNodeList.length; for (var i = 0; i < frameNum; i++) { var locActionNode = this._actionNodeList[i]; - locActionNode.playAction(this.getLoop()); + locActionNode.playAction(fun); } if (this._loop) { - this._scheduler.scheduleCallbackForTarget(this, this.simulationActionUpdate, this, 0., cc.REPEAT_FOREVER, 0, false); - } + this._scheduler.scheduleCallbackForTarget(this, this.simulationActionUpdate, 0, cc.REPEAT_FOREVER, 0, false); + } }, /** diff --git a/extensions/CocoStudio/GUI/BaseClasses/UIWidget.js b/extensions/CocoStudio/GUI/BaseClasses/UIWidget.js index 50960353ba..f1f727cbbe 100644 --- a/extensions/CocoStudio/GUI/BaseClasses/UIWidget.js +++ b/extensions/CocoStudio/GUI/BaseClasses/UIWidget.js @@ -200,8 +200,7 @@ ccs.UIWidget = ccs.Class.extend(/** @lends ccs.UIWidget# */{ var locChild; for (var i = 0; i < this._children.length; i++) { locChild = this._children[i]; - if (locChild instanceof ccs.UIWidget) - locChild.onEnter(); + locChild.onEnter(); } this._isRunning = true; this.updateSizeAndPosition(); @@ -212,8 +211,7 @@ ccs.UIWidget = ccs.Class.extend(/** @lends ccs.UIWidget# */{ var locChild; for (var i = 0; i < this._children.length; i++) { locChild = this._children[i]; - if (locChild instanceof ccs.UIWidget) - locChild.onExit(); + locChild.onExit(); } }, @@ -631,14 +629,10 @@ ccs.UIWidget = ccs.Class.extend(/** @lends ccs.UIWidget# */{ } this._updateEnabled = enable; if (enable) { - if (this._scheduler) { - this._scheduler.scheduleUpdateForTarget(this, 0, false); - } + this._scheduler.scheduleUpdateForTarget(this, 0, false); } else { - if (this._scheduler) { - this._scheduler.unscheduleUpdateForTarget(this); - } + this._scheduler.unscheduleUpdateForTarget(this); } }, diff --git a/extensions/CocoStudio/GUI/Layouts/UILayout.js b/extensions/CocoStudio/GUI/Layouts/UILayout.js index 32f98b3a30..116668c7ea 100644 --- a/extensions/CocoStudio/GUI/Layouts/UILayout.js +++ b/extensions/CocoStudio/GUI/Layouts/UILayout.js @@ -750,10 +750,11 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{ default: break; } - var locRelativeWidgetMargin; + var locRelativeWidgetMargin,locRelativeWidgetLPAlign; var locMargin = locLayoutParameter.getMargin(); if (locRelativeWidgetLP) { locRelativeWidgetMargin = locRelativeWidgetLP.getMargin(); + locRelativeWidgetLPAlign = locRelativeWidgetLP.getAlign(); } //handle margin switch (locAlign) { @@ -791,10 +792,10 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{ case ccs.UIRelativeAlign.locationAboveLeftAlign: locFinalPosY += locMargin.bottom; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopCenterHorizontal - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopCenterHorizontal + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight) { locFinalPosY += locRelativeWidgetMargin.top; } @@ -802,20 +803,20 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{ break; case ccs.UIRelativeAlign.locationAboveCenter: locFinalPosY += locMargin.bottom; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopCenterHorizontal - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopCenterHorizontal + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight) { locFinalPosY += locRelativeWidgetMargin.top; } break; case ccs.UIRelativeAlign.locationAboveRightAlign: locFinalPosY += locMargin.bottom; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopCenterHorizontal - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopCenterHorizontal + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight) { locFinalPosY += locRelativeWidgetMargin.top; } @@ -823,10 +824,10 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{ break; case ccs.UIRelativeAlign.locationLeftOfTopAlign: locFinalPosX -= locMargin.right; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftCenterVertical) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftCenterVertical) { locFinalPosX -= locRelativeWidgetMargin.left; } @@ -834,20 +835,20 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{ break; case ccs.UIRelativeAlign.locationLeftOfCenter: locFinalPosX -= locMargin.right; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftCenterVertical) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftCenterVertical) { locFinalPosX -= locRelativeWidgetMargin.left; } break; case ccs.UIRelativeAlign.locationLeftOfBottomAlign: locFinalPosX -= locMargin.right; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopLeft - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignNone - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftCenterVertical) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopLeft + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignNone + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftCenterVertical) { locFinalPosX -= locRelativeWidgetMargin.left; } @@ -856,9 +857,9 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{ break; case ccs.UIRelativeAlign.locationRightOfTopAlign: locFinalPosX += locMargin.left; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightCenterVertical) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightCenterVertical) { locFinalPosX += locRelativeWidgetMargin.right; } @@ -866,18 +867,18 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{ break; case ccs.UIRelativeAlign.locationRightOfCenter: locFinalPosX += locMargin.left; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightCenterVertical) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightCenterVertical) { locFinalPosX += locRelativeWidgetMargin.right; } break; case ccs.UIRelativeAlign.locationRightOfBottomAlign: locFinalPosX += locMargin.left; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentTopRight - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightCenterVertical) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentTopRight + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightCenterVertical) { locFinalPosX += locRelativeWidgetMargin.right; } @@ -886,9 +887,9 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{ break; case ccs.UIRelativeAlign.locationBelowLeftAlign: locFinalPosY -= locMargin.top; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal) { locFinalPosY -= locRelativeWidgetMargin.bottom; } @@ -896,18 +897,18 @@ ccs.UILayout = ccs.UIWidget.extend(/** @lends ccs.UILayout# */{ break; case ccs.UIRelativeAlign.locationBelowCenter: locFinalPosY -= locMargin.top; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal) { locFinalPosY -= locRelativeWidgetMargin.bottom; } break; case ccs.UIRelativeAlign.locationBelowRightAlign: locFinalPosY -= locMargin.top; - if (locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentLeftBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentRightBottom - && locRelativeWidgetLP.getAlign() != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal) + if (locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentLeftBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentRightBottom + && locRelativeWidgetLPAlign != ccs.UIRelativeAlign.alignParentBottomCenterHorizontal) { locFinalPosY -= locRelativeWidgetMargin.bottom; } diff --git a/extensions/CocoStudio/GUI/System/UIInputManager.js b/extensions/CocoStudio/GUI/System/UIInputManager.js index 7c4a20e2a1..8ca8772e21 100644 --- a/extensions/CocoStudio/GUI/System/UIInputManager.js +++ b/extensions/CocoStudio/GUI/System/UIInputManager.js @@ -28,7 +28,6 @@ * @extends ccs.Class */ ccs.UIInputManager = ccs.Class.extend({ - _manageredWidget: null, _selectedWidgets: null, _touchBeganedPoint: null, _touchMovedPoint: null, @@ -40,7 +39,6 @@ ccs.UIInputManager = ccs.Class.extend({ _checkedDoubleClickWidget: null, _rootWidget: null, ctor: function () { - this._manageredWidget = null; this._selectedWidgets = []; this._touchBeganedPoint = cc.p(0, 0); this._touchMovedPoint = cc.p(0, 0); @@ -53,20 +51,6 @@ ccs.UIInputManager = ccs.Class.extend({ this._rootWidget = null; }, - /** - * Regist a widget to input manager. - * @param {ccs.UIWidget} widget - */ - registWidget: function (widget) { - if (!widget) { - return; - } - if (cc.ArrayContainsObject(this._manageredWidget, widget)) { - return; - } - this._manageredWidget.push(widget); - }, - /** * Check touch event * @param {ccs.UIWidget} root @@ -90,20 +74,6 @@ ccs.UIInputManager = ccs.Class.extend({ return false; }, - /** - * Remove a registed widget from input manager. - * @param {ccs.UIWidget} widget - */ - removeManageredWidget: function (widget) { - if (!widget) { - return; - } - if (!cc.ArrayContainsObject(this._manageredWidget, widget)) { - return; - } - cc.ArrayRemoveObject(this._manageredWidget, widget); - }, - /** * Finds a widget which is selected and call it's "onTouchBegan" method. * @param {cc.Point} touchPoint diff --git a/extensions/CocoStudio/GUI/System/UILayer.js b/extensions/CocoStudio/GUI/System/UILayer.js index 68a4244464..131034b1bc 100644 --- a/extensions/CocoStudio/GUI/System/UILayer.js +++ b/extensions/CocoStudio/GUI/System/UILayer.js @@ -54,10 +54,6 @@ ccs.UILayer = cc.Layer.extend(/** @lends ccs.UILayer# */{ cc.Layer.prototype.onExit.call(this); }, - onEnterTransitionDidFinish: function () { - cc.Layer.prototype.onEnterTransitionDidFinish.call(this); - }, - /** * add widget * @param {ccs.Widget} widget @@ -130,7 +126,7 @@ ccs.UILayer = cc.Layer.extend(/** @lends ccs.UILayer# */{ }, onTouchBegan: function (touch, event) { - if (this._inputManager && this._inputManager.onTouchBegan(touch)) { + if (this._inputManager.onTouchBegan(touch)) { return true; } return false; diff --git a/extensions/CocoStudio/GUI/UIWidgets/UIButton.js b/extensions/CocoStudio/GUI/UIWidgets/UIButton.js index c37af60aa5..1be53350ec 100644 --- a/extensions/CocoStudio/GUI/UIWidgets/UIButton.js +++ b/extensions/CocoStudio/GUI/UIWidgets/UIButton.js @@ -179,35 +179,24 @@ ccs.UIButton = ccs.UIWidget.extend(/** @lends ccs.UIButton# */{ texType = texType||ccs.TextureResType.local; this._normalFileName = normal; this._normalTexType = texType; + + switch (this._normalTexType) { + case ccs.TextureResType.local: + this._buttonNormalRenderer.initWithFile(normal); + break; + case ccs.TextureResType.plist: + this._buttonNormalRenderer.initWithSpriteFrameName(normal); + break; + default: + break; + } + + this._buttonNormalRenderer.setColor(this.getColor()); + this._buttonNormalRenderer.setOpacity(this.getOpacity()); + if (this._scale9Enabled) { - switch (this._normalTexType) { - case ccs.TextureResType.local: - this._buttonNormalRenderer.initWithFile(normal); - break; - case ccs.TextureResType.plist: - this._buttonNormalRenderer.initWithSpriteFrameName(normal); - break; - default: - break; - } - this._buttonNormalRenderer.setColor(this.getColor()); - this._buttonNormalRenderer.setOpacity(this.getOpacity()); this._buttonNormalRenderer.setCapInsets(this._capInsetsNormal); } - else { - switch (this._normalTexType) { - case ccs.TextureResType.local: - this._buttonNormalRenderer.initWithFile(normal); - break; - case ccs.TextureResType.plist: - this._buttonNormalRenderer.initWithSpriteFrameName(normal); - break; - default: - break; - } - this._buttonNormalRenderer.setColor(this.getColor()); - this._buttonNormalRenderer.setOpacity(this.getOpacity()); - } this._normalTextureSize = this._buttonNormalRenderer.getContentSize(); this.updateAnchorPoint(); this.normalTextureScaleChangedWithSize(); @@ -225,35 +214,24 @@ ccs.UIButton = ccs.UIWidget.extend(/** @lends ccs.UIButton# */{ texType = texType || ccs.TextureResType.local; this._clickedFileName = selected; this._pressedTexType = texType; + + switch (this._pressedTexType) { + case ccs.TextureResType.local: + this._buttonClickedRenderer.initWithFile(selected); + break; + case ccs.TextureResType.plist: + this._buttonClickedRenderer.initWithSpriteFrameName(selected); + break; + default: + break; + } + + this._buttonClickedRenderer.setColor(this.getColor()); + this._buttonClickedRenderer.setOpacity(this.getOpacity()); + if (this._scale9Enabled) { - switch (this._pressedTexType) { - case ccs.TextureResType.local: - this._buttonClickedRenderer.initWithFile(selected); - break; - case ccs.TextureResType.plist: - this._buttonClickedRenderer.initWithSpriteFrameName(selected); - break; - default: - break; - } - this._buttonClickedRenderer.setColor(this.getColor()); - this._buttonClickedRenderer.setOpacity(this.getOpacity()); this._buttonClickedRenderer.setCapInsets(this._capInsetsNormal); } - else { - switch (this._pressedTexType) { - case ccs.TextureResType.local: - this._buttonClickedRenderer.initWithFile(selected); - break; - case ccs.TextureResType.plist: - this._buttonClickedRenderer.initWithSpriteFrameName(selected); - break; - default: - break; - } - this._buttonClickedRenderer.setColor(this.getColor()); - this._buttonClickedRenderer.setOpacity(this.getOpacity()); - } this._pressedTextureSize = this._buttonClickedRenderer.getContentSize(); this.updateAnchorPoint(); this.pressedTextureScaleChangedWithSize(); @@ -271,35 +249,24 @@ ccs.UIButton = ccs.UIWidget.extend(/** @lends ccs.UIButton# */{ texType = texType || ccs.TextureResType.local; this._disabledFileName = disabled; this._disabledTexType = texType; + + switch (this._disabledTexType) { + case ccs.TextureResType.local: + this._buttonDisableRenderer.initWithFile(disabled); + break; + case ccs.TextureResType.plist: + this._buttonDisableRenderer.initWithSpriteFrameName(disabled); + break; + default: + break; + } + + this._buttonDisableRenderer.setColor(this.getColor()); + this._buttonDisableRenderer.setOpacity(this.getOpacity()); + if (this._scale9Enabled) { - switch (this._disabledTexType) { - case ccs.TextureResType.local: - this._buttonDisableRenderer.initWithFile(disabled); - break; - case ccs.TextureResType.plist: - this._buttonDisableRenderer.initWithSpriteFrameName(disabled); - break; - default: - break; - } - this._buttonDisableRenderer.setColor(this.getColor()); - this._buttonDisableRenderer.setOpacity(this.getOpacity()); this._buttonDisableRenderer.setCapInsets(this._capInsetsNormal); } - else { - switch (this._disabledTexType) { - case ccs.TextureResType.local: - this._buttonDisableRenderer.initWithFile(disabled); - break; - case ccs.TextureResType.plist: - this._buttonDisableRenderer.initWithSpriteFrameName(disabled); - break; - default: - break; - } - this._buttonDisableRenderer.setColor(this.getColor()); - this._buttonDisableRenderer.setOpacity(this.getOpacity()); - } this._disabledTextureSize = this._buttonDisableRenderer.getContentSize(); this.updateAnchorPoint(); this.disabledTextureScaleChangedWithSize(); diff --git a/extensions/CocoStudio/GUI/UIWidgets/UIImageView.js b/extensions/CocoStudio/GUI/UIWidgets/UIImageView.js index d06a763848..07b9e1fa13 100644 --- a/extensions/CocoStudio/GUI/UIWidgets/UIImageView.js +++ b/extensions/CocoStudio/GUI/UIWidgets/UIImageView.js @@ -76,34 +76,19 @@ ccs.UIImageView = ccs.UIWidget.extend(/** @lends ccs.UIImageView# */{ this._imageTexType = texType; switch (this._imageTexType) { case ccs.TextureResType.local: - if (this._scale9Enabled) { - this._imageRenderer.initWithFile(fileName); - this._imageRenderer.setColor(this.getColor()); - this._imageRenderer.setOpacity(this.getOpacity()); - this._imageRenderer.setCapInsets(this._capInsets); - } - else { - this._imageRenderer.initWithFile(fileName); - this._imageRenderer.setColor(this.getColor()); - this._imageRenderer.setOpacity(this.getOpacity()); - } + this._imageRenderer.initWithFile(fileName); break; case ccs.TextureResType.plist: - if (this._scale9Enabled) { - this._imageRenderer.initWithSpriteFrameName(fileName); - this._imageRenderer.setColor(this.getColor()); - this._imageRenderer.setOpacity(this.getOpacity()); - this._imageRenderer.setCapInsets(this._capInsets); - } - else { - this._imageRenderer.initWithSpriteFrameName(fileName); - this._imageRenderer.setColor(this.getColor()); - this._imageRenderer.setOpacity(this.getOpacity()); - } + this._imageRenderer.initWithSpriteFrameName(fileName); break; default: break; } + this._imageRenderer.setColor(this.getColor()); + this._imageRenderer.setOpacity(this.getOpacity()); + if (this._scale9Enabled) { + this._imageRenderer.setCapInsets(this._capInsets); + } this._imageTextureSize = this._imageRenderer.getContentSize(); this.updateAnchorPoint(); this.imageTextureScaleChangedWithSize(); diff --git a/extensions/CocoStudio/GUI/UIWidgets/UILoadingBar.js b/extensions/CocoStudio/GUI/UIWidgets/UILoadingBar.js index 3734c95eab..f5114c0b25 100644 --- a/extensions/CocoStudio/GUI/UIWidgets/UILoadingBar.js +++ b/extensions/CocoStudio/GUI/UIWidgets/UILoadingBar.js @@ -117,32 +117,19 @@ ccs.UILoadingBar = ccs.UIWidget.extend(/** @lends ccs.UILoadingBar# */{ this._textureFile = texture; switch (this._renderBarTexType) { case ccs.TextureResType.local: - if (this._scale9Enabled){ - this._barRenderer.initWithFile(texture); - this._barRenderer.setCapInsets(this._capInsets); - } - else - this._barRenderer.initWithFile(texture); + this._barRenderer.initWithFile(texture); break; case ccs.TextureResType.plist: - if (this._scale9Enabled){ - this._barRenderer.initWithSpriteFrameName(texture); - this._barRenderer.setCapInsets(this._capInsets); - } - else - this._barRenderer.initWithSpriteFrameName(texture); + this._barRenderer.initWithSpriteFrameName(texture); break; default: break; } - if (this._scale9Enabled) { - this._barRenderer.setColor(this.getColor()); - this._barRenderer.setOpacity(this.getOpacity()); - } - else { - this._barRenderer.setColor(this.getColor()); - this._barRenderer.setOpacity(this.getOpacity()); + if (this._scale9Enabled){ + this._barRenderer.setCapInsets(this._capInsets); } + this._barRenderer.setColor(this.getColor()); + this._barRenderer.setOpacity(this.getOpacity()); this._barRendererTextureSize.width = this._barRenderer.getContentSize().width; this._barRendererTextureSize.height = this._barRenderer.getContentSize().height; @@ -220,17 +207,13 @@ ccs.UILoadingBar = ccs.UIWidget.extend(/** @lends ccs.UILoadingBar# */{ var res = this._percent / 100.0; var x = 0, y = 0; - switch (this._renderBarTexType) { - case ccs.TextureResType.plist: - var barNode = this._barRenderer; - if (barNode) { - var to = barNode.getTextureRect().origin; - x = to.x; - y = to.y; - } - break; - default: - break; + if(this._renderBarTexType==ccs.TextureResType.plist){ + var barNode = this._barRenderer; + if (barNode) { + var to = barNode.getTextureRect().origin; + x = to.x; + y = to.y; + } } if (this._scale9Enabled) this.setScale9Scale(); diff --git a/extensions/CocoStudio/GUI/UIWidgets/UISlider.js b/extensions/CocoStudio/GUI/UIWidgets/UISlider.js index 255ee9fac1..233f84490a 100644 --- a/extensions/CocoStudio/GUI/UIWidgets/UISlider.js +++ b/extensions/CocoStudio/GUI/UIWidgets/UISlider.js @@ -129,14 +129,8 @@ ccs.UISlider = ccs.UIWidget.extend(/** @lends ccs.UISlider# */{ default: break; } - if (this._scale9Enabled) { - this._barRenderer.setColor(this.getColor()); - this._barRenderer.setOpacity(this.getOpacity()); - } - else { - this._barRenderer.setColor(this.getColor()); - this._barRenderer.setOpacity(this.getOpacity()); - } + this._barRenderer.setColor(this.getColor()); + this._barRenderer.setOpacity(this.getOpacity()); this.barRendererScaleChangedWithSize(); }, @@ -162,14 +156,8 @@ ccs.UISlider = ccs.UIWidget.extend(/** @lends ccs.UISlider# */{ default: break; } - if (this._scale9Enabled) { - this._progressBarRenderer.setColor(this.getColor()); - this._progressBarRenderer.setOpacity(this.getOpacity()); - } - else { - this._progressBarRenderer.setColor(this.getColor()); - this._progressBarRenderer.setOpacity(this.getOpacity()); - } + this._progressBarRenderer.setColor(this.getColor()); + this._progressBarRenderer.setOpacity(this.getOpacity()); this._progressBarRenderer.setAnchorPoint(cc.p(0.0, 0.5)); var locSize = this._progressBarRenderer.getContentSize(); this._progressBarTextureSize.width = locSize.width; @@ -369,17 +357,13 @@ ccs.UISlider = ccs.UIWidget.extend(/** @lends ccs.UISlider# */{ } else { var x = 0, y = 0; - switch (this._progressBarTexType) { - case ccs.TextureResType.plist: - var barNode = this._progressBarRenderer; - if (barNode) { - var to = barNode.getTextureRect().origin; - x = to.x; - y = to.y; - } - break; - default: - break; + if (this._progressBarTexType == ccs.TextureResType.plist) { + var barNode = this._progressBarRenderer; + if (barNode) { + var to = barNode.getTextureRect().origin; + x = to.x; + y = to.y; + } } this._progressBarRenderer.setTextureRect(cc.rect(x, y, this._progressBarTextureSize.width * (percent / 100.0), this._progressBarTextureSize.height)); } diff --git a/extensions/CocoStudio/Reader/GUIReader.js b/extensions/CocoStudio/Reader/GUIReader.js index 17409ba4a3..0424a37e1f 100644 --- a/extensions/CocoStudio/Reader/GUIReader.js +++ b/extensions/CocoStudio/Reader/GUIReader.js @@ -49,23 +49,24 @@ ccs.GUIReader = ccs.Class.extend(/** @lends ccs.GUIReader# */{ * @returns {Number} */ getVersionInteger: function (str) { - /*********temp***********/ + if(!str) + return 0; var strVersion = str; - var length = strVersion.length; - if (length < 7) { + var versionLength = strVersion.length; + if (versionLength < 7) { return 0; } var pos = strVersion.indexOf("."); var t = strVersion.substr(0, pos); - strVersion = strVersion.substr(pos + 1, strVersion.length - 1); + strVersion = strVersion.substr(pos + 1, versionLength - 1); pos = strVersion.indexOf("."); var h = strVersion.substr(0, pos); - strVersion = strVersion.substr(pos + 1, strVersion.length - 1); + strVersion = strVersion.substr(pos + 1, versionLength - 1); pos = strVersion.indexOf("."); var te = strVersion.substr(0, pos); - strVersion = strVersion.substr(pos + 1, strVersion.length - 1); + strVersion = strVersion.substr(pos + 1, versionLength - 1); pos = strVersion.indexOf("."); var s; @@ -109,7 +110,6 @@ ccs.GUIReader = ccs.Class.extend(/** @lends ccs.GUIReader# */{ */ widgetFromJsonFile: function (fileName) { var jsonPath = fileName || ""; - var fullJsonPath = cc.FileUtils.getInstance().fullPathForFilename(fileName); var pos = jsonPath.lastIndexOf('/'); this._filePath = jsonPath.substr(0, pos + 1); var des = cc.FileUtils.getInstance().getTextFileData(jsonPath); @@ -121,8 +121,8 @@ ccs.GUIReader = ccs.Class.extend(/** @lends ccs.GUIReader# */{ var fileVersion = jsonDict["version"]; var pReader, widget; + var versionInteger = this.getVersionInteger(fileVersion); if (fileVersion) { - var versionInteger = this.getVersionInteger(fileVersion); if (versionInteger < 250) { pReader = new ccs.WidgetPropertiesReader0250(); widget = pReader.createWidget(jsonDict, this._filePath, fileName); @@ -135,7 +135,7 @@ ccs.GUIReader = ccs.Class.extend(/** @lends ccs.GUIReader# */{ widget = pReader.createWidget(jsonDict, this._filePath, fileName); } - if (!fileVersion || this.getVersionInteger(fileVersion) < 250) { + if (!fileVersion || versionInteger < 250) { this._olderVersion = true; } jsonDict = null; @@ -278,7 +278,6 @@ ccs.WidgetPropertiesReader0250 = ccs.WidgetPropertiesReader.extend({ var x = options["x"]; var y = options["y"]; widget.setPosition(cc.p(x, y)); - ; if (options.hasOwnProperty("scaleX")) { widget.setScaleX(options["scaleX"]); } @@ -365,9 +364,9 @@ ccs.WidgetPropertiesReader0250 = ccs.WidgetPropertiesReader.extend({ if (options.hasOwnProperty("fontName")) { button.setTitleFontName(options["fontName"]); } - var cr = options.hasOwnProperty("colorR") ? options["colorR"] : 255; - var cg = options.hasOwnProperty("colorG") ? options["colorG"] : 255; - var cb = options.hasOwnProperty("colorB") ? options["colorB"] : 255; + var cr = options.hasOwnProperty("textColorR") ? options["textColorR"] : 255; + var cg = options.hasOwnProperty("textColorG") ? options["textColorG"] : 255; + var cb = options.hasOwnProperty("textColorB") ? options["textColorB"] : 255; var tc = cc.c3b(cr, cg, cb); button.setTitleColor(tc); this.setColorPropsForWidgetFromJsonDictionary(widget, options); @@ -527,28 +526,19 @@ ccs.WidgetPropertiesReader0250 = ccs.WidgetPropertiesReader.extend({ var imageFileName = options["backGroundImage"]; var imageFileName_tp = imageFileName ? this._filePath + imageFileName : null; var useMergedTexture = options["useMergedTexture"]; + if (useMergedTexture) { + panel.setBackGroundImage(imageFileName, ccs.TextureResType.plist); + } + else { + panel.setBackGroundImage(imageFileName_tp); + } if (backGroundScale9Enable) { var cx = options["capInsetsX"]; var cy = options["capInsetsY"]; var cw = options["capInsetsWidth"]; var ch = options["capInsetsHeight"]; - if (useMergedTexture) { - panel.setBackGroundImage(imageFileName, ccs.TextureResType.plist); - } - else { - panel.setBackGroundImage(imageFileName_tp); - } panel.setBackGroundImageCapInsets(cc.rect(cx, cy, cw, ch)); } - else { - - if (useMergedTexture) { - panel.setBackGroundImage(imageFileName, ccs.TextureResType.plist); - } - else { - panel.setBackGroundImage(imageFileName_tp); - } - } this.setColorPropsForWidgetFromJsonDictionary(widget, options); }, @@ -897,7 +887,6 @@ ccs.WidgetPropertiesReader0300 = ccs.WidgetPropertiesReader.extend({ var x = options["x"]; var y = options["y"]; widget.setPosition(cc.p(x, y)); - ; if (options.hasOwnProperty("scaleX")) { widget.setScaleX(options["scaleX"]); } @@ -1136,6 +1125,8 @@ ccs.WidgetPropertiesReader0300 = ccs.WidgetPropertiesReader.extend({ } frontCrossDisabledDic = null; + var selectedState = options["selectedState"] || false; + widget.setSelectedState(selectedState); this.setColorPropsForWidgetFromJsonDictionary(widget, options); }, @@ -1250,7 +1241,7 @@ ccs.WidgetPropertiesReader0300 = ccs.WidgetPropertiesReader.extend({ var backGroundScale9Enable = options["backGroundScale9Enable"]; panel.setBackGroundImageScale9Enabled(backGroundScale9Enable); var cr = options["bgColorR"]; - var cg = options["bgColorG"] + var cg = options["bgColorG"]; var cb = options["bgColorB"]; var scr = options["bgStartColorR"];