diff --git a/cocos2dx/layers_scenes_transitions_nodes/CCTransition.cpp b/cocos2dx/layers_scenes_transitions_nodes/CCTransition.cpp index 5a2ace7aaa..8cb5f9c0b9 100644 --- a/cocos2dx/layers_scenes_transitions_nodes/CCTransition.cpp +++ b/cocos2dx/layers_scenes_transitions_nodes/CCTransition.cpp @@ -1053,7 +1053,7 @@ void CCFadeTransition :: onEnter() __super::onEnter(); CCColorLayer* l = CCColorLayer::layerWithColor(m_tColor); - m_pOutScene->setIsVisible(false); + m_pInScene->setIsVisible(false); addChild(l, 2, kSceneFade); CCNode* f = getChildByTag(kSceneFade); diff --git a/test_uphone/tests/TransitionsTest/TransitionsTest.cpp b/test_uphone/tests/TransitionsTest/TransitionsTest.cpp index 7fc8bef229..391c54b153 100644 --- a/test_uphone/tests/TransitionsTest/TransitionsTest.cpp +++ b/test_uphone/tests/TransitionsTest/TransitionsTest.cpp @@ -223,12 +223,12 @@ CCTransitionScene* createTransition(int nIndex, ccTime t, CCScene* s) case 18: return FlipYDownOver::transitionWithDuration(t, s); case 19: return FlipAngularLeftOver::transitionWithDuration(t, s); case 20: return FlipAngularRightOver::transitionWithDuration(t, s); - case 21: return ZoomFlipXLeftOver::transitionWithDuration(t, s); - case 22: return ZoomFlipXRightOver::transitionWithDuration(t, s); - case 23: return ZoomFlipYUpOver::transitionWithDuration(t, s); - case 24: return ZoomFlipYDownOver::transitionWithDuration(t, s); - case 25: return ZoomFlipAngularLeftOver::transitionWithDuration(t, s); -// case 26: return ZoomFlipAngularRightOver::transitionWithDuration(t, s); +// case 21: return ZoomFlipXLeftOver::transitionWithDuration(t, s); +// case 22: return ZoomFlipXRightOver::transitionWithDuration(t, s); +// case 23: return ZoomFlipYUpOver::transitionWithDuration(t, s); +// case 24: return ZoomFlipYDownOver::transitionWithDuration(t, s); +// case 25: return ZoomFlipAngularLeftOver::transitionWithDuration(t, s); + case 26: return ZoomFlipAngularRightOver::transitionWithDuration(t, s); case 27: return CCShrinkGrowTransition::transitionWithDuration(t, s); case 28: return CCRotoZoomTransition::transitionWithDuration(t, s); case 29: return CCMoveInLTransition::transitionWithDuration(t, s); @@ -419,7 +419,7 @@ TestLayer2::~TestLayer2() void TestLayer2::restartCallback(NSObject* pSender) { - CCScene* s = CCScene::node(); + CCScene* s = new TransitionsTestScene(); CCLayer* pLayer = new TestLayer1(); s->addChild(pLayer); @@ -433,7 +433,7 @@ void TestLayer2::restartCallback(NSObject* pSender) void TestLayer2::nextCallback(NSObject* pSender) { - CCScene* s = CCScene::node(); + CCScene* s = new TransitionsTestScene(); CCLayer* pLayer = new TestLayer1(); s->addChild(pLayer); @@ -447,7 +447,7 @@ void TestLayer2::nextCallback(NSObject* pSender) void TestLayer2::backCallback(NSObject* pSender) { - CCScene* s = CCScene::node(); + CCScene* s = new TransitionsTestScene(); CCLayer* pLayer = new TestLayer1(); s->addChild(pLayer); diff --git a/test_uphone/tests/testBasic.cpp b/test_uphone/tests/testBasic.cpp index 248be8aa92..6bc14403ca 100644 --- a/test_uphone/tests/testBasic.cpp +++ b/test_uphone/tests/testBasic.cpp @@ -30,6 +30,7 @@ void BackToMainMenuLayer::MainMenuCallback(NSObject* pSender) TestScene::TestScene() { + __super::init(); CCLayer* pLayer = new BackToMainMenuLayer(); pLayer->autorelease();