From 90b9d5f4b80a4bf54afd1bc4e32efe269ace1ff9 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Wed, 19 Jul 2017 16:30:45 +0800 Subject: [PATCH] fix schedule error --- cocos2d/core/CCScheduler.js | 2 +- jsb/jsb-etc.js | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cocos2d/core/CCScheduler.js b/cocos2d/core/CCScheduler.js index 04aecfeeff..759d1ac5f2 100644 --- a/cocos2d/core/CCScheduler.js +++ b/cocos2d/core/CCScheduler.js @@ -535,7 +535,7 @@ cc.Scheduler = cc._Class.extend({ //selector, target, interval, repeat, delay, paused //selector, target, interval, paused if (arguments.length === 4 || arguments.length === 5) { - paused = repeat; + paused = !!repeat; repeat = cc.macro.REPEAT_FOREVER; delay = 0; } diff --git a/jsb/jsb-etc.js b/jsb/jsb-etc.js index 28ea17aa25..a9b31d8d2a 100644 --- a/jsb/jsb-etc.js +++ b/jsb/jsb-etc.js @@ -75,9 +75,15 @@ cc.js.mixin(cc.path, { // cc.Scheduler cc.Scheduler.prototype.schedule = function (callback, target, interval, repeat, delay, paused) { - repeat = isFinite(repeat) ? repeat : cc.macro.REPEAT_FOREVER; - delay = delay || 0; - paused = !!paused; + if (delay === undefined || paused === undefined) { + paused = !!repeat; + repeat = cc.macro.REPEAT_FOREVER; + } + else { + paused = !!paused; + repeat = isFinite(repeat) ? repeat : cc.macro.REPEAT_FOREVER; + } + delay = delay || 0; this.scheduleCallbackForTarget(target, callback, interval, repeat, delay, paused); }; cc.Scheduler.prototype.scheduleUpdate = cc.Scheduler.prototype.scheduleUpdateForTarget;