diff --git a/CCBoot.js b/CCBoot.js index 09ba2c3033..ac493e78a0 100644 --- a/CCBoot.js +++ b/CCBoot.js @@ -1894,6 +1894,7 @@ var _initSys = function () { case sys.BROWSER_TYPE_UNKNOWN: case sys.BROWSER_TYPE_360: case sys.BROWSER_TYPE_MIUI: + case sys.BROWSER_TYPE_UC: _supportWebGL = false; } } diff --git a/cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js b/cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js index 9edfa69743..ea0dbb16e1 100644 --- a/cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js +++ b/cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js @@ -465,9 +465,11 @@ cc.Node.RenderCmd.prototype = { if (colorDirty || opacityDirty) this._updateColor(); - if (locFlag & flags.transformDirty) - //update the transform + if (locFlag & flags.transformDirty) { + //update the transform this.transform(parentCmd); + this._dirtyFlag = this._dirtyFlag & flags.transformDirty ^ this._dirtyFlag; + } if (locFlag & flags.orderDirty) this._dirtyFlag = this._dirtyFlag & flags.orderDirty ^ this._dirtyFlag; diff --git a/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js b/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js index 9a06754aba..2c02588996 100644 --- a/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js +++ b/cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js @@ -89,7 +89,7 @@ var node = this._node, hasRotation = (node._rotationX || node._rotationY), layerOrientation = node.layerOrientation, tiles = node.tiles, - alpha = this._displayedOpacity / 255; + alpha = node._opacity / 255; if (!tiles || alpha <= 0) { return; diff --git a/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js b/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js index 7695d9fa06..36103af82b 100644 --- a/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js +++ b/cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js @@ -76,7 +76,7 @@ mapx = ox * a + oy * c + tx, mapy = ox * b + oy * d + ty; - var opacity = this._displayedOpacity, + var opacity = node._opacity, cr = this._displayedColor.r, cg = this._displayedColor.g, cb = this._displayedColor.b; diff --git a/extensions/gui/scrollview/CCScrollViewWebGLRenderCmd.js b/extensions/gui/scrollview/CCScrollViewWebGLRenderCmd.js index 64bfc7b7a8..d435aac834 100644 --- a/extensions/gui/scrollview/CCScrollViewWebGLRenderCmd.js +++ b/extensions/gui/scrollview/CCScrollViewWebGLRenderCmd.js @@ -62,7 +62,7 @@ var node = this._node; if (node._scissorRestored) { //restore the parent's scissor rect var rect = node._parentScissorRect; - cc.view.setScissorInPoints(rect.x, rect.y, rect.width, rect.height) + cc.view.setScissorInPoints(rect.x, rect.y, rect.width, rect.height); }else{ var ctx = cc._renderContext; ctx.disable(ctx.SCISSOR_TEST); diff --git a/extensions/gui/scrollview/CCTableView.js b/extensions/gui/scrollview/CCTableView.js index 30fc610c08..b7b8ef044f 100644 --- a/extensions/gui/scrollview/CCTableView.js +++ b/extensions/gui/scrollview/CCTableView.js @@ -520,6 +520,8 @@ cc.TableView = cc.ScrollView.extend(/** @lends cc.TableView# */{ this._updateContentSize(); if (this._dataSource.numberOfCellsInTableView(this) > 0) this.scrollViewDidScroll(this); + + this.setNodeDirty(); }, /**