From 98ad78974e858d38603011aecc1d28117913f514 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 7 Aug 2017 00:49:06 +0800 Subject: [PATCH 1/2] [native] Improve setTimeout, setInterval implementation --- jsb/jsb-etc.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jsb/jsb-etc.js b/jsb/jsb-etc.js index 8ff79407a8..aaf689bc0b 100644 --- a/jsb/jsb-etc.js +++ b/jsb/jsb-etc.js @@ -140,7 +140,7 @@ window.setTimeout = function (code, delay, ...args) { original.call(this); clearTimeout(target._intervalId); }; - cc.director.getScheduler()._schedule(target.fun, target, delay / 1000, 0, 0, false, target._intervalId+''); + cc.director.getScheduler().schedule(target.fun, target, delay / 1000, 0, 0, false); _windowTimeFunHash[target._intervalId] = target; return target._intervalId; }; @@ -156,7 +156,7 @@ window.setInterval = function (code, delay, ...args) { if (args.length > 0) { target._args = args; } - cc.director.getScheduler()._schedule(target.fun, target, delay / 1000, cc.macro.REPEAT_FOREVER, 0, false, target._intervalId+''); + cc.director.getScheduler().schedule(target.fun, target, delay / 1000, cc.macro.REPEAT_FOREVER, 0, false); _windowTimeFunHash[target._intervalId] = target; return target._intervalId; }; @@ -168,7 +168,7 @@ window.setInterval = function (code, delay, ...args) { window.clearInterval = function (intervalId) { var target = _windowTimeFunHash[intervalId]; if (target) { - cc.director.getScheduler()._unschedule(target._intervalId+'', target); + cc.director.getScheduler().unschedule(target.fun, target); delete _windowTimeFunHash[intervalId]; } }; From 3150f46f1bf229f50edbac60522cafcacaefeab4 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 8 Aug 2017 11:57:54 +0800 Subject: [PATCH 2/2] [missed] Use Label pool instead of new --- cocos2d/core/components/CCLabel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/components/CCLabel.js b/cocos2d/core/components/CCLabel.js index 9f9836c7cc..484b794dde 100644 --- a/cocos2d/core/components/CCLabel.js +++ b/cocos2d/core/components/CCLabel.js @@ -526,7 +526,7 @@ var Label = cc.Class({ } } else { cc.warnID(4011, font.name); - sgNode = this._sgNode = new _ccsg.Label(this.string); + sgNode = this._sgNode = _ccsg.Label.pool.get(this.string); } } else { sgNode = this._sgNode = _ccsg.Label.pool.get(this.string, font, null, this._fontSize);