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

Merge pull request #12381 from VisualSJ/v3-aa 

[ci skip]Fix some simple bug
This commit is contained in:
子龙山人 2015-06-17 15:11:08 +08:00
parent b1831ea5fb 0a223adf7c
commit fd508a0198
6 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/js-tests/src/CocoStudioTest/CustomTest/CustomImageScene/CustomImageScene.js
View File

@ -33,7 +33,7 @@ var CustomImageLayer = cc.Layer.extend({
customImageViewReader, customImageViewReader,
customImageViewReader.setProperties); customImageViewReader.setProperties);
var layout = guiReader.widgetFromJsonFile("css-res/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson"); var layout = guiReader.widgetFromJsonFile("ccs-res/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson");
this.addChild(layout); this.addChild(layout);
} }
}); });

4
tests/js-tests/src/FacebookTest/FacebookTestsManager.js
View File

@ -43,8 +43,8 @@ FacebookTestScene = TestScene.extend({
if(!cc.sys.isNative) { //browser if(!cc.sys.isNative) { //browser
cc.loader.loadJs('', [ cc.loader.loadJs('', [
"../../../web/external/pluginx/platform/facebook_sdk.js", "../../web/external/pluginx/platform/facebook_sdk.js",
"../../../web/external/pluginx/platform/facebook.js" "../../web/external/pluginx/platform/facebook.js"
], function() { ], function() {
var layer = nextFacebookTest(); var layer = nextFacebookTest();
self.addChild(layer); self.addChild(layer);

10
tests/js-tests/src/GUITest/UIScene.js
View File

@ -55,17 +55,19 @@ UIScene = cc.Scene.extend({
this._sceneTitle = widget.getChildByName("UItest"); this._sceneTitle = widget.getChildByName("UItest");
var back_label = widget.getChildByName("back");
var label = new cc.LabelTTF("Main Menu", "Arial", 20); if(back_label){
back_label.addTouchEventListener(this.toExtensionsMainLayer, this);
}else{
var label = new cc.LabelTTF("Back", "Arial", 20);
var menuItem = new cc.MenuItemLabel(label, this.toExtensionsMainLayer, this); var menuItem = new cc.MenuItemLabel(label, this.toExtensionsMainLayer, this);
var menu = new cc.Menu(menuItem); var menu = new cc.Menu(menuItem);
menu.x = 0; menu.x = 0;
menu.y = 0; menu.y = 0;
menuItem.x = winSize.width - 50; menuItem.x = winSize.width - 50;
menuItem.y = 25; menuItem.y = 25;
this.addChild(menu, 1); this.addChild(menu, 1);
}
var left_button = widget.getChildByName("left_Button"); var left_button = widget.getChildByName("left_Button");
left_button.addTouchEventListener(this.previousCallback ,this); left_button.addTouchEventListener(this.previousCallback ,this);

4
tests/js-tests/src/GUITest/UIVideoPlayerTest/UIVideoPlayerTest.js
View File

@ -3,7 +3,7 @@ var UIVideoPlayerTest = UIScene.extend({
onEnter: function(){ onEnter: function(){
UIScene.prototype.onEnter.call(this); UIScene.prototype.onEnter.call(this);
var video = new ccui.VideoPlayer("http://benchmark.cocos2d-x.org/cocosvideo.mp4"); var video = new ccui.VideoPlayer("cocosvideo.mp4");
video.setContentSize(320, 240); video.setContentSize(320, 240);
video.setPosition(800/2, 450/2); video.setPosition(800/2, 450/2);
video.setScale(0.5); video.setScale(0.5);
@ -37,7 +37,7 @@ var UIVideoPlayerTest = UIScene.extend({
}}, }},
{ name: "PLAYNATIVE", func: function(){ { name: "PLAYNATIVE", func: function(){
cc.log("play!"); cc.log("play!");
video.setURL("res/cocosvideo.mp4"); video.setURL("cocosvideo.mp4");
video.play(); video.play();
}}, }},
{ name: "STOP", func: function(){ { name: "STOP", func: function(){

1
tests/js-tests/src/SchedulerTest/SchedulerTest.js
View File

@ -644,6 +644,7 @@ var SchedulerTimeScale = SchedulerTestLayer.extend({
}, },
onExit: function() { onExit: function() {
cc.director.getScheduler().setTimeScale(1);
// restore scale // restore scale
cc.director.getScheduler().unscheduleUpdateForTarget(this._newScheduler); cc.director.getScheduler().unscheduleUpdateForTarget(this._newScheduler);
this._super(); this._super();

3
tests/js-tests/src/tests_resources.js
View File

@ -1096,3 +1096,6 @@ var g_ccs2 = [
"ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt", "ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt",
"ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png" "ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png"
]; ];
res.CCControlColourPickerSpriteSheet_plist = "extensions/CCControlColourPickerSpriteSheet.plist";
res.CCControlColourPickerSpriteSheet_png = "extensions/CCControlColourPickerSpriteSheet.png";