From 6ae6cab6800506a71c216e4f6fed266e8fa081ec Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 12 Sep 2017 16:45:53 +0800 Subject: [PATCH 1/2] Fix failed to cancel callback when setting fps --- cocos2d/core/CCGame.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/CCGame.js b/cocos2d/core/CCGame.js index 921aef4b30..94900574c1 100644 --- a/cocos2d/core/CCGame.js +++ b/cocos2d/core/CCGame.js @@ -564,8 +564,8 @@ var game = { } } - director.mainLoop(); self._intervalId = window.requestAnimFrame(callback); + director.mainLoop(); } }; From 0bb9be8e204622cde222afdb4ce2bcafcae49691 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 12 Sep 2017 16:55:13 +0800 Subject: [PATCH 2/2] Improve logic --- cocos2d/core/CCGame.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cocos2d/core/CCGame.js b/cocos2d/core/CCGame.js index 94900574c1..32f486a5e0 100644 --- a/cocos2d/core/CCGame.js +++ b/cocos2d/core/CCGame.js @@ -557,14 +557,12 @@ var game = { callback = function () { if (!self._paused) { + self._intervalId = window.requestAnimFrame(callback); if (frameRate === 30) { if (skip = !skip) { - self._intervalId = window.requestAnimFrame(callback); return; } } - - self._intervalId = window.requestAnimFrame(callback); director.mainLoop(); } };