Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug: #21906 Pause/Resume 's result not correct.

This commit is contained in:
Vincent Yang 2015-08-10 17:58:49 +08:00
parent cb751e3c1a
commit d0a5c02399
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/base/CCScheduler.cpp
View File

@ -108,7 +108,7 @@ void Timer::update(float dt)
{
trigger();
_elapsed = 0;
_elapsed -= _interval;
}
}
else

2
tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.cpp
View File

@ -80,7 +80,6 @@ std::string SchedulerAutoremove::subtitle() const
void SchedulerPauseResume::onEnter()
{
SchedulerTestLayer::onEnter();
schedule(CC_SCHEDULE_SELECTOR(SchedulerPauseResume::tick1), 0.5f);
schedule(CC_SCHEDULE_SELECTOR(SchedulerPauseResume::tick2), 0.5f);
schedule(CC_SCHEDULE_SELECTOR(SchedulerPauseResume::pause), 3.0f);
@ -98,6 +97,7 @@ void SchedulerPauseResume::tick2(float dt)
void SchedulerPauseResume::pause(float dt)
{
CCLOG("pause, tick1 and tick2 should called six times");
Director::getInstance()->getScheduler()->pauseTarget(this);
}