From c91b12e49eec19a36118b22b99d8d07cc1ac93bc Mon Sep 17 00:00:00 2001 From: zilongshanren Date: Tue, 6 Jun 2017 14:40:09 +0800 Subject: [PATCH 1/2] fix jsb modular --- gulpfile.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gulpfile.js b/gulpfile.js index 54e4a89a3c..8c71f2f870 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -76,6 +76,33 @@ var jsbSkipModules = [ '../../cocos2d/core/physics/platform/CCPhysicsRayCastCallback.js', '../../cocos2d/core/physics/platform/CCPhysicsContactListner.js', '../../cocos2d/core/camera/CCSGCameraNode.js', + '../../cocos2d/core/label/CCSGLabel.js', + '../../cocos2d/core/label/CCSGLabelCanvasRenderCmd.js', + '../../cocos2d/core/label/CCSGLabelWebGLRenderCmd.js', + '../../cocos2d/clipping-nodes/CCClippingNode.js', + '../../cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js', + '../../cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js', + '../../cocos2d/core/videoplayer/CCSGVideoPlayer.js', + '../../cocos2d/core/webview/CCSGWebView.js', + '../../cocos2d/core/editbox/CCSGEditBox.js', + '../../cocos2d/particle/CCSGParticleSystem.js', + '../../cocos2d/particle/CCSGParticleSystemCanvasRenderCmd.js', + '../../cocos2d/particle/CCSGParticleSystemWebGLRenderCmd.js', + '../../cocos2d/particle/CCParticleBatchNode.js', + '../../cocos2d/particle/CCParticleBatchNodeCanvasRenderCmd.js', + '../../cocos2d/particle/CCParticleBatchNodeWebGLRenderCmd.js', + '../../cocos2d/tilemap/CCSGTMXTiledMap.js', + '../../cocos2d/tilemap/CCTMXXMLParser.js', + '../../cocos2d/tilemap/CCSGTMXObjectGroup.js', + '../../cocos2d/tilemap/CCSGTMXObject.js', + '../../cocos2d/tilemap/CCSGTMXLayer.js', + '../../cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js', + '../../cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js', + '../../cocos2d/motion-streak/CCSGMotionStreak.js', + '../../cocos2d/motion-streak/CCSGMotionStreakWebGLRenderCmd.js', + '../../cocos2d/render-texture/CCRenderTexture.js', + '../../cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js', + '../../cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js' ]; gulp.task('build-jsb-extends-dev', function (done) { From 3c2776afd2452f48edefc43fec283a895d724cb8 Mon Sep 17 00:00:00 2001 From: zilongshanren Date: Tue, 6 Jun 2017 15:12:51 +0800 Subject: [PATCH 2/2] fix button multiple event callback --- cocos2d/core/components/CCComponentEventHandler.js | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos2d/core/components/CCComponentEventHandler.js b/cocos2d/core/components/CCComponentEventHandler.js index 0798a9776d..cf35a2ba49 100644 --- a/cocos2d/core/components/CCComponentEventHandler.js +++ b/cocos2d/core/components/CCComponentEventHandler.js @@ -144,6 +144,7 @@ cc.Component.EventHandler = cc.Class({ if (typeof(handler) !== 'function') return; if (this.customEventData != null && this.customEventData !== '') { + params = params.slice(); params.push(this.customEventData); }