Skip to content

Commit

Permalink
Merge pull request #514 from wuzhiming/master2
Browse files Browse the repository at this point in the history
add CCPool into extensions   add the missing back button
  • Loading branch information
dingpinglv committed Jun 28, 2014
2 parents 02b80ed + e501fd1 commit 19b4dde
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions samples/js-tests/src/ExtensionsTest/CCPoolTest/CCPoolTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ var CCPoolTest = cc.Layer.extend({
this.addChild(this.directLabel);
this.addChild(this.poolLabel);
this.addChild(menu, 100);

// Back Menu
var itemBack = cc.MenuItemFont.create("Back", this.toExtensionsMainLayer, this);
itemBack.setPosition(cc.p(winSize.width - 50, 25));
var menuBack = cc.Menu.create(itemBack);
menuBack.setPosition(cc.p(0, 0));
this.addChild(menuBack);
},
setDirectLabel: function (time) {
if (time == 0) {
Expand Down Expand Up @@ -124,6 +131,10 @@ var CCPoolTest = cc.Layer.extend({
obj.EndTime = Date.now();
obj.DeltaTime = obj.EndTime - obj.startTime;
return obj.DeltaTime;
},
toExtensionsMainLayer: function (sender) {
var scene = new ExtensionsTestScene();
scene.runThisTest();
}
});

Expand Down

0 comments on commit 19b4dde

Please sign in to comment.