diff --git a/tests/js-tests/src/CocoStudioTest/ArmatureTest/ArmatureTest.js b/tests/js-tests/src/CocoStudioTest/ArmatureTest/ArmatureTest.js index 8881ff875f..60d38c45bb 100644 --- a/tests/js-tests/src/CocoStudioTest/ArmatureTest/ArmatureTest.js +++ b/tests/js-tests/src/CocoStudioTest/ArmatureTest/ArmatureTest.js @@ -558,9 +558,9 @@ var TestParticleDisplay = ArmatureTestLayer.extend({ this.armature.getAnimation().setSpeedScale(0.5); this.addChild(this.armature); - var p1 = new cc.ParticleSystem("res/Particles/SmallSun.plist"); + var p1 = new cc.ParticleSystem("Particles/SmallSun.plist"); p1.setTotalParticles(30); - var p2 = new cc.ParticleSystem("res/Particles/SmallSun.plist"); + var p2 = new cc.ParticleSystem("Particles/SmallSun.plist"); p2.setTotalParticles(30); var bone = new ccs.Bone("p1"); bone.addDisplay(p1, 0); diff --git a/tests/js-tests/src/CocoStudioTest/ComponentsTest/ComponentsTestScene.js b/tests/js-tests/src/CocoStudioTest/ComponentsTest/ComponentsTestScene.js index 5d13cf29bb..3051d2b3b2 100644 --- a/tests/js-tests/src/CocoStudioTest/ComponentsTest/ComponentsTestScene.js +++ b/tests/js-tests/src/CocoStudioTest/ComponentsTest/ComponentsTestScene.js @@ -42,7 +42,7 @@ var ComponentsTestLayer = cc.LayerColor.extend({ createGameScene: function () { var root = new cc.Node(); var winSize = cc.director.getWinSize(); - var player = new cc.Sprite("res/components/Player.png", cc.rect(0, 0, 27, 40)); + var player = new cc.Sprite("components/Player.png", cc.rect(0, 0, 27, 40)); player.x = 30; player.y = winSize.height / 2; root.addChild(player, 1, 1); @@ -59,7 +59,7 @@ var ComponentsTestLayer = cc.LayerColor.extend({ }, toExtensionsMainLayer: function (sender) { - cc.audioEngine.stopMusic("res/Sound/background-music-aac.wav"); + cc.audioEngine.stopMusic("background-music-aac.wav"); var scene = new CocoStudioTestScene(); scene.runThisTest(); } diff --git a/tests/js-tests/src/CocoStudioTest/ComponentsTest/PlayerController.js b/tests/js-tests/src/CocoStudioTest/ComponentsTest/PlayerController.js index 03dc538619..d49f7c1526 100644 --- a/tests/js-tests/src/CocoStudioTest/ComponentsTest/PlayerController.js +++ b/tests/js-tests/src/CocoStudioTest/ComponentsTest/PlayerController.js @@ -44,14 +44,14 @@ var PlayerController = ccs.ComController.extend({ onTouchesEnded: function (touch, event) { var location = touch[0].getLocation(); - var projectile = new cc.Sprite("res/components/Projectile.png", cc.rect(0, 0, 20, 20)); + var projectile = new cc.Sprite("components/Projectile.png", cc.rect(0, 0, 20, 20)); this.getOwner().parent.addChild(projectile, 1, 4); var com = ProjectileController.create(); projectile.addComponent(com); com.move(location.x, location.y); - this.getOwner().getComponent("Audio").playEffect("res/Sound/pew-pew-lei.wav"); + this.getOwner().getComponent("Audio").playEffect("pew-pew-lei.wav"); }, onExit:function(){ cc.eventManager.removeListener(this._listener1); diff --git a/tests/js-tests/src/CocoStudioTest/ComponentsTest/SceneController.js b/tests/js-tests/src/CocoStudioTest/ComponentsTest/SceneController.js index e244174e99..ea4a515ea1 100644 --- a/tests/js-tests/src/CocoStudioTest/ComponentsTest/SceneController.js +++ b/tests/js-tests/src/CocoStudioTest/ComponentsTest/SceneController.js @@ -43,7 +43,7 @@ var SceneController = ccs.ComController.extend({ this._addTargetTime = 1; this._targets = []; this._projectiles = []; - this.getOwner().getComponent("Audio").playBackgroundMusic("res/Sound/background-music-aac.wav", true); + this.getOwner().getComponent("Audio").playBackgroundMusic("background-music-aac.wav", true); this.getOwner().getComponent("CCComAttribute").setInt("KillCount", 0); }, @@ -60,7 +60,7 @@ var SceneController = ccs.ComController.extend({ }, addTarget: function () { - var target = new cc.Sprite("res/components/Target.png", cc.rect(0, 0, 27, 40)); + var target = new cc.Sprite("components/Target.png", cc.rect(0, 0, 27, 40)); this.getOwner().addChild(target, 1, 2); target.addComponent(EnemyController.create()); target.tag = 2; diff --git a/tests/js-tests/src/CocoStudioTest/CustomTest/CustomImageScene/CustomImageScene.js b/tests/js-tests/src/CocoStudioTest/CustomTest/CustomImageScene/CustomImageScene.js index 57042f3e62..32193417af 100644 --- a/tests/js-tests/src/CocoStudioTest/CustomTest/CustomImageScene/CustomImageScene.js +++ b/tests/js-tests/src/CocoStudioTest/CustomTest/CustomImageScene/CustomImageScene.js @@ -33,7 +33,7 @@ var CustomImageLayer = cc.Layer.extend({ customImageViewReader, customImageViewReader.setProperties); - var layout = guiReader.widgetFromJsonFile("res/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson"); + var layout = guiReader.widgetFromJsonFile("css-res/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson"); this.addChild(layout); } }); diff --git a/tests/js-tests/src/CocoStudioTest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.js b/tests/js-tests/src/CocoStudioTest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.js index 772f2c1c2e..3b150a183f 100644 --- a/tests/js-tests/src/CocoStudioTest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.js +++ b/tests/js-tests/src/CocoStudioTest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.js @@ -35,7 +35,7 @@ var CustomParticleWidgetLayer = cc.Layer.extend({ var custom = CustomParticleWidget.create(); custom.setPosition(cc.p(370, 210)); - custom.setParticlePlist("res/Particles/BoilingFoam.plist"); + custom.setParticlePlist("Particles/BoilingFoam.plist"); this.addChild(custom, 10, -1); } diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UIButtonTest/UIButtonTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UIButtonTest/UIButtonTest.js index cfff52221a..e782f88291 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UIButtonTest/UIButtonTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UIButtonTest/UIButtonTest.js @@ -27,7 +27,7 @@ var UIButtonEditorTest = UIBaseLayer.extend({ ctor: function () { this._super(); - var root = this._parseUIFile("res/cocosui/CCS/Button/Button_1.json"); + var root = this._parseUIFile("ccs-res/cocosui/UIEditorTest/UIButton/Button_1.json"); this._mainNode.addChild(root); var back_label = ccui.helper.seekWidgetByName(root, "back"); diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UICheckBoxTest/UICheckBoxTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UICheckBoxTest/UICheckBoxTest.js index d5f89573a4..e9b09bd745 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UICheckBoxTest/UICheckBoxTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UICheckBoxTest/UICheckBoxTest.js @@ -29,7 +29,7 @@ var UICheckBoxEditorTest = UIBaseLayer.extend({ ctor: function () { this._super(); var left_button = new ccui.Button(); - left_button.loadTextures("res/Images/b1.png", "res/Images/b2.png", ""); + left_button.loadTextures("Images/b1.png", "Images/b2.png", ""); left_button.x = 240-50; left_button.y = 50; left_button.anchorX = 0.5; @@ -38,7 +38,7 @@ var UICheckBoxEditorTest = UIBaseLayer.extend({ this._mainNode.addChild(left_button, 999); var right_button = new ccui.Button(); - right_button.loadTextures("res/Images/f1.png", "res/Images/f2.png", ""); + right_button.loadTextures("Images/f1.png", "Images/f2.png", ""); right_button.x = 240+50; right_button.y = 50; right_button.anchorX = 0.5; @@ -86,7 +86,7 @@ var UICheckBoxEditorTest = UIBaseLayer.extend({ var UICheckBoxOldTest = UICheckBoxEditorTest.extend({ ctor: function () { this._super(); - var root = this._parseUIFile("res/cocosui/CCS/CheckBox/checkbox_1.json"); + var root = this._parseUIFile("ccs-res/cocosui/UIEditorTest/UICheckBox/checkbox_1.json"); this._mainNode.addChild(root); var back_label =ccui.helper.seekWidgetByName(root, "back"); @@ -100,7 +100,7 @@ var UICheckBoxOldTest = UICheckBoxEditorTest.extend({ var UICheckBoxNewTest = UICheckBoxEditorTest.extend({ ctor: function () { this._super(); - var root = ccs.load("res/cocosui/CCS/CheckBox/MainScene.json"); + var root = ccs.load("ccs-res/cocosui/UIEditorTest/UICheckBox/MainScene.json"); this._mainNode.addChild(root.node); var checkbox = ccui.helper.seekWidgetByName(root.node, "CheckBox_1"); checkbox.addEventListener(this.selectedStateEvent,this); diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UIImageViewTest/UIImageViewTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UIImageViewTest/UIImageViewTest.js index f92f400761..30a8b24e6a 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UIImageViewTest/UIImageViewTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UIImageViewTest/UIImageViewTest.js @@ -27,7 +27,7 @@ var UIImageViewEditorTest = UIBaseLayer.extend({ ctor: function () { this._super(); - var root = this._parseUIFile("res/cocosui/CCS/ImageView/ImageView_1.json"); + var root = this._parseUIFile("ccs-res/cocosui/UIEditorTest/UIImageView/ImageView_1.json"); this._mainNode.addChild(root); var back_label =ccui.helper.seekWidgetByName(root, "back"); diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UILayoutTest/UILayoutTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UILayoutTest/UILayoutTest.js index 6284598fca..399c64315c 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UILayoutTest/UILayoutTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UILayoutTest/UILayoutTest.js @@ -24,15 +24,15 @@ THE SOFTWARE. ****************************************************************************/ var LAYOUT_RES = [ - "res/cocosui/CCS/Layout/Layout/layout_1.json", - "res/cocosui/CCS/Layout/Color/color_1.json", - "res/cocosui/CCS/Layout/Gradient_Color/gradient_color_1.json", - "res/cocosui/CCS/Layout/BackgroundImage/backgroundimage_1.json", - "res/cocosui/CCS/Layout/Scale9/scale9.json", - "res/cocosui/CCS/Layout/Linear_Vertical/linear_vertical.json", - "res/cocosui/CCS/Layout/Linear_Horizontal/linear_horizontal.json", - "res/cocosui/CCS/Layout/Relative_Align_Parent/relative_align_parent.json", - "res/cocosui/CCS/Layout/Relative_Align_Location/relative_align_location.json" + "ccs-res/cocosui/UIEditorTest/UILayout/Layout/layout_1.json", + "ccs-res/cocosui/UIEditorTest/UILayout/Color/color_1.json", + "ccs-res/cocosui/UIEditorTest/UILayout/Gradient_Color/gradient_color_1.json", + "ccs-res/cocosui/UIEditorTest/UILayout/BackgroundImage/backgroundimage_1.json", + "ccs-res/cocosui/UIEditorTest/UILayout/Scale9_BackgroundImage/scale9.json", + "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Vertical_Layout/linear_vertical.json", + "ccs-res/cocosui/UIEditorTest/UILayout/Linear_Horizontal_Layout/linear_horizontal.json", + "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Parent/relative_align_parent.json", + "ccs-res/cocosui/UIEditorTest/UILayout/Relative_Align_Location/relative_align_location.json" ]; var LAYOUT_INDEX = 0; var UILayoutEditorTest = UIBaseLayer.extend({ @@ -45,7 +45,7 @@ var UILayoutEditorTest = UIBaseLayer.extend({ back_label.addTouchEventListener(this.backEvent, this); var left_button = new ccui.Button(); - left_button.loadTextures("res/Images/b1.png", "res/Images/b2.png", ""); + left_button.loadTextures("Images/b1.png", "Images/b2.png", ""); left_button.x = 240-50; left_button.y = 50; left_button.anchorX = 0.5; @@ -55,7 +55,7 @@ var UILayoutEditorTest = UIBaseLayer.extend({ this._mainNode.addChild(left_button); var right_button = new ccui.Button(); - right_button.loadTextures("res/Images/f1.png", "res/Images/f2.png", ""); + right_button.loadTextures("Images/f1.png", "Images/f2.png", ""); right_button.x = 240+50; right_button.y = 50; right_button.zOrder = 999; diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UIListViewTest/UIListViewTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UIListViewTest/UIListViewTest.js index 54201c6dcb..11aad78a66 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UIListViewTest/UIListViewTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UIListViewTest/UIListViewTest.js @@ -24,8 +24,8 @@ THE SOFTWARE. ****************************************************************************/ var LISTVIEW_RES = [ - "res/cocosui/CCS/ListView/Vertical/vertical_1.json", - "res/cocosui/CCS/ListView/Horizontal/horizontal_1.json" + "ccs-res/cocosui/UIEditorTest/UIListView/Vertical/vertical_1.json", + "ccs-res/cocosui/UIEditorTest/UIListView/Horizontal/horizontal_1.json" ]; var LISTVIEW_INDEX = 0; var UIListViewEditorTest = UIBaseLayer.extend({ @@ -41,7 +41,7 @@ var UIListViewEditorTest = UIBaseLayer.extend({ listView.addEventListener(this.selectedItemEvent,this); var left_button = new ccui.Button(); - left_button.loadTextures("res/Images/b1.png", "res/Images/b2.png", ""); + left_button.loadTextures("Images/b1.png", "Images/b2.png", ""); left_button.x = 240-50; left_button.y = 50; left_button.anchorX = 0.5; @@ -51,7 +51,7 @@ var UIListViewEditorTest = UIBaseLayer.extend({ this._mainNode.addChild(left_button); var right_button = new ccui.Button(); - right_button.loadTextures("res/Images/f1.png", "res/Images/f2.png", ""); + right_button.loadTextures("Images/f1.png", "Images/f2.png", ""); right_button.x = 240+50; right_button.y = 50; right_button.zOrder = 999; diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UILoadingBarTest/UILoadingBarTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UILoadingBarTest/UILoadingBarTest.js index 677f71301b..6be9d13de9 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UILoadingBarTest/UILoadingBarTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UILoadingBarTest/UILoadingBarTest.js @@ -30,7 +30,7 @@ var UILoadingBarEditorTest = UIBaseLayer.extend({ _loadingBar_right_to_left:null, ctor: function () { this._super(); - var root = this._parseUIFile("res/cocosui/CCS/LoadingBar/loadingbar_1.json"); + var root = this._parseUIFile("ccs-res/cocosui/UIEditorTest/UILoadingBar/loadingbar_1.json"); this._mainNode.addChild(root); var back_label =ccui.helper.seekWidgetByName(root, "back"); diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UINodeContainerTest/UINodeContainerTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UINodeContainerTest/UINodeContainerTest.js index f2f047cb0c..d03af69b74 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UINodeContainerTest/UINodeContainerTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UINodeContainerTest/UINodeContainerTest.js @@ -27,13 +27,13 @@ var UIWidgetAddNodeEditorTest = UIBaseLayer.extend({ ctor: function () { this._super(); - var root = this._parseUIFile("res/cocosui/CCS/WidgetAddNode/widget_add_node.json"); + var root = this._parseUIFile("ccs-res/cocosui/UIEditorTest/UIWidgetAddNode/widget_add_node.json"); this._mainNode.addChild(root); var back_label =ccui.helper.seekWidgetByName(root, "back"); back_label.addTouchEventListener(this.backEvent,this); - var sprite = new cc.Sprite("res/cocosui/ccicon.png"); + var sprite = new cc.Sprite("ccs-res/cocosui/ccicon.png"); sprite.x = 240; sprite.y = 160; root.addNode(sprite,9999); diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UIPageViewTest/UIPageViewTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UIPageViewTest/UIPageViewTest.js index f50749bfe0..94c20a1838 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UIPageViewTest/UIPageViewTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UIPageViewTest/UIPageViewTest.js @@ -27,7 +27,7 @@ var UIPageViewEditorTest = UIBaseLayer.extend({ ctor: function () { this._super(); - var root = this._parseUIFile("res/cocosui/CCS/PageView/pageview_1.json"); + var root = this._parseUIFile("ccs-res/cocosui/UIEditorTest/UIPageView/pageview_1.json"); this._mainNode.addChild(root); var back_label =ccui.helper.seekWidgetByName(root, "back"); diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UIRichTextTest/UIRichTextTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UIRichTextTest/UIRichTextTest.js index 16c0ce2324..6a1f9a0617 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UIRichTextTest/UIRichTextTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UIRichTextTest/UIRichTextTest.js @@ -35,7 +35,7 @@ var UIRichTextTest = UISceneEditor.extend({ var widgetSize = this._widget.getContentSize(); var button = new ccui.Button(); button.setTouchEnabled(true); - button.loadTextures("res/cocosui/animationbuttonnormal.png", "res/cocosui/animationbuttonpressed.png", ""); + button.loadTextures("ccs-res/cocosui/animationbuttonnormal.png", "ccs-res/cocosui/animationbuttonpressed.png", ""); button.setTitleText("switch"); button.setPosition(cc.p(widgetSize.width / 2, widgetSize.height / 2 + button.getContentSize().height * 2.5)); button.addTouchEventListener(this.touchEvent,this); @@ -53,9 +53,9 @@ var UIRichTextTest = UISceneEditor.extend({ var re4 = new ccui.RichElementText(4, cc.color.GREEN, 255, "And green. ", "Helvetica", 10); var re5 = new ccui.RichElementText(5, cc.color.RED, 255, "Last one is red ", "Helvetica", 10); - var reimg = new ccui.RichElementImage(6, cc.color.WHITE, 255, "res/cocosui/sliderballnormal.png"); + var reimg = new ccui.RichElementImage(6, cc.color.WHITE, 255, "ccs-res/cocosui/sliderballnormal.png"); - ccs.armatureDataManager.addArmatureFileInfo("res/cocosui/100/100.ExportJson"); + ccs.armatureDataManager.addArmatureFileInfo("ccs-res/cocosui/100/100.ExportJson"); var pAr = new ccs.Armature("100"); pAr.getAnimation().play("Animation1"); diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UIScrollViewTest/UIScrollViewTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UIScrollViewTest/UIScrollViewTest.js index 6bf63a4bfc..9a3d2bfcac 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UIScrollViewTest/UIScrollViewTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UIScrollViewTest/UIScrollViewTest.js @@ -25,9 +25,9 @@ ****************************************************************************/ var SCROLLVIEW_RES = [ - "res/cocosui/CCS/ScrollView/Vertical/vertical_1.json", - "res/cocosui/CCS/ScrollView/Horizontal/horizontal_1.json", - "res/cocosui/CCS/ScrollView/Both/both_1.json" + "ccs-res/cocosui/UIEditorTest/UIScrollView/Vertical/vertical_1.json", + "ccs-res/cocosui/UIEditorTest/UIScrollView/Horizontal/horizontal_1.json", + "ccs-res/cocosui/UIEditorTest/UIScrollView/Both/both_1.json" ]; var SCROLLVIEW_INDEX = 0; var UIScrollViewEditorTest = UIBaseLayer.extend({ @@ -40,7 +40,7 @@ var UIScrollViewEditorTest = UIBaseLayer.extend({ back_label.addTouchEventListener(this.backEvent, this); var left_button = new ccui.Button(); - left_button.loadTextures("res/Images/b1.png", "res/Images/b2.png", ""); + left_button.loadTextures("Images/b1.png", "Images/b2.png", ""); left_button.x = 240-50; left_button.y = 50; left_button.anchorX = 0.5; @@ -50,7 +50,7 @@ var UIScrollViewEditorTest = UIBaseLayer.extend({ this._mainNode.addChild(left_button); var right_button = new ccui.Button(); - right_button.loadTextures("res/Images/f1.png", "res/Images/f2.png", ""); + right_button.loadTextures("Images/f1.png", "Images/f2.png", ""); right_button.x = 240+50; right_button.y = 50; right_button.zOrder = 999; diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UISliderTest/UISliderTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UISliderTest/UISliderTest.js index 727e9cddc3..5540ba681f 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UISliderTest/UISliderTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UISliderTest/UISliderTest.js @@ -27,7 +27,7 @@ var UISliderEditorTest = UIBaseLayer.extend({ ctor: function () { this._super(); - var root = this._parseUIFile("res/cocosui/CCS/Slider/slider_1.json"); + var root = this._parseUIFile("ccs-res/cocosui/UIEditorTest/UISlider/slider_1.json"); this._mainNode.addChild(root); var back_label =ccui.helper.seekWidgetByName(root, "back"); diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UITextAtlasTest/UITextAtlasTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UITextAtlasTest/UITextAtlasTest.js index d7aed9254c..8871058d71 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UITextAtlasTest/UITextAtlasTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UITextAtlasTest/UITextAtlasTest.js @@ -28,7 +28,7 @@ var UITextAtlasEditorTest = UIBaseLayer.extend({ ctor: function () { this._super(); - var root = this._parseUIFile("res/cocosui/CCS/LabelAtlas/labelatlas_1.json"); + var root = this._parseUIFile("ccs-res/cocosui/UIEditorTest/UILabelAtlas/labelatlas_1.json"); this._mainNode.addChild(root); diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UITextBMFontTest/UITextBMFontTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UITextBMFontTest/UITextBMFontTest.js index 1b23e535e6..830038a63e 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UITextBMFontTest/UITextBMFontTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UITextBMFontTest/UITextBMFontTest.js @@ -28,7 +28,7 @@ var UITextBMFontEditorTest = UIBaseLayer.extend({ ctor: function () { this._super(); - var root = this._parseUIFile("res/cocosui/CCS/LabelBMFont/labelbmfont_1.json"); + var root = this._parseUIFile("ccs-res/cocosui/UIEditorTest/UILabelBMFont/labelbmfont_1.json"); this._mainNode.addChild(root); var back_label =ccui.helper.seekWidgetByName(root, "back"); diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UITextFieldTest/UITextFieldTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UITextFieldTest/UITextFieldTest.js index e8fa7a86a1..ff1d443fbc 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UITextFieldTest/UITextFieldTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UITextFieldTest/UITextFieldTest.js @@ -27,7 +27,7 @@ var UITextFieldEditorTest = UIBaseLayer.extend({ ctor: function () { this._super(); - var root = this._parseUIFile("res/cocosui/CCS/TextField/textfield_1.json"); + var root = this._parseUIFile("ccs-res/cocosui/UIEditorTest/UITextField/textfield_1.json"); this._mainNode.addChild(root); var back_label =ccui.helper.seekWidgetByName(root, "back"); diff --git a/tests/js-tests/src/CocoStudioTest/GUITest/UITextTest/UITextTest.js b/tests/js-tests/src/CocoStudioTest/GUITest/UITextTest/UITextTest.js index ecadf762f1..46b7c20a60 100644 --- a/tests/js-tests/src/CocoStudioTest/GUITest/UITextTest/UITextTest.js +++ b/tests/js-tests/src/CocoStudioTest/GUITest/UITextTest/UITextTest.js @@ -28,7 +28,7 @@ var UITextEditorTest = UIBaseLayer.extend({ ctor: function () { this._super(); - var root = this._parseUIFile("res/cocosui/CCS/Label/label_1.json"); + var root = this._parseUIFile("ccs-res/cocosui/UIEditorTest/UILabel/label_1.json"); this._mainNode.addChild(root); var back_label =ccui.helper.seekWidgetByName(root, "back"); diff --git a/tests/js-tests/src/CocoStudioTest/ParserTest/ParserTest.js b/tests/js-tests/src/CocoStudioTest/ParserTest/ParserTest.js index 5fbd215ebc..f59b8ec35c 100644 --- a/tests/js-tests/src/CocoStudioTest/ParserTest/ParserTest.js +++ b/tests/js-tests/src/CocoStudioTest/ParserTest/ParserTest.js @@ -27,22 +27,22 @@ var g_parsersTests = [ { title: "cocostudio 1.3", test: function(){ - new CocostudioParserJsonScene("res/cocosui/CCS/ccs1_3/CCSV1_3_1.ExportJson").runThisTest(); + new CocostudioParserJsonScene("ccs-res/cocosui/UIEditorTest/cocostudio1_3/CocostudioV1_3_1.ExportJson").runThisTest(); } },{ title: "cocostudio 1.4", test: function(){ - new CocostudioParserJsonScene("res/cocosui/CCS/ccs1_4/CCS1_4_1.ExportJson").runThisTest(); + new CocostudioParserJsonScene("ccs-res/cocosui/UIEditorTest/cocostudio1_4/Cocostudio1_4_1.ExportJson").runThisTest(); } },{ title: "cocostudio 1.5", test: function(){ - new CocostudioParserJsonScene("res/cocosui/CCS/ccs1_5/CCS1_5_1.ExportJson").runThisTest(); + new CocostudioParserJsonScene("ccs-res/cocosui/UIEditorTest/cocostudio1_5/Cocostudio1_5_1.ExportJson").runThisTest(); } },{ title: "cocostudio 2.1", test: function(){ - new CocostudioParserJsonScene("res/cocosui/CCS/2.1/MainScene.json").runThisTest(); + new CocostudioParserJsonScene("ccs-res/cocosui/UIEditorTest/2.1/MainScene.json").runThisTest(); } } ]; diff --git a/tests/js-tests/src/CocoStudioTest/SceneTest/SceneEditorTest.js b/tests/js-tests/src/CocoStudioTest/SceneTest/SceneEditorTest.js index 7a4238df2b..451a961640 100644 --- a/tests/js-tests/src/CocoStudioTest/SceneTest/SceneEditorTest.js +++ b/tests/js-tests/src/CocoStudioTest/SceneTest/SceneEditorTest.js @@ -151,7 +151,7 @@ var LoadSceneEdtiorFileTest = SceneEditorTestLayer.extend({ onEnter: function () { this._super(); var node, - file = "res/scenetest/LoadSceneEdtiorFileTest/FishJoy2.json"; + file = "ccs-res/scenetest/LoadSceneEdtiorFileTest/FishJoy2.json"; if(cocoStudioOldApiFlag == 0){ cc.log("ccs.load : %s", file); var json = ccs.load(file); @@ -183,7 +183,7 @@ var SpriteComponentTest = SceneEditorTestLayer.extend({ onEnter: function () { this._super(); var node, - file = "res/scenetest/SpriteComponentTest/SpriteComponentTest.json"; + file = "ccs-res/scenetest/SpriteComponentTest/SpriteComponentTest.json"; if(cocoStudioOldApiFlag == 0){ cc.log("ccs.load : %s", file); var json = ccs.load(file); @@ -219,7 +219,7 @@ var ArmatureComponentTest = SceneEditorTestLayer.extend({ onEnter: function () { this._super(); var node, - file = "res/scenetest/ArmatureComponentTest/ArmatureComponentTest.json"; + file = "ccs-res/scenetest/ArmatureComponentTest/ArmatureComponentTest.json"; if(cocoStudioOldApiFlag == 0){ cc.log("ccs.load : %s", file); var json = ccs.load(file); @@ -254,7 +254,7 @@ var UIComponentTest = SceneEditorTestLayer.extend({ onEnter: function () { this._super(); var node, - file = "res/scenetest/UIComponentTest/UIComponentTest.json"; + file = "ccs-res/scenetest/UIComponentTest/UIComponentTest.json"; if(cocoStudioOldApiFlag == 0){ cc.log("ccs.load : %s", file); var json = ccs.load(file); @@ -299,7 +299,7 @@ var TmxMapComponentTest = SceneEditorTestLayer.extend({ onEnter: function () { this._super(); var node, - file = "res/scenetest/TmxMapComponentTest/TmxMapComponentTest.json"; + file = "ccs-res/scenetest/TmxMapComponentTest/TmxMapComponentTest.json"; if(cocoStudioOldApiFlag == 0){ cc.log("ccs.load : %s", file); var json = ccs.load(file); @@ -340,7 +340,7 @@ var ParticleComponentTest = SceneEditorTestLayer.extend({ onEnter: function () { this._super(); var node, - file = "res/scenetest/ParticleComponentTest/ParticleComponentTest.json"; + file = "ccs-res/scenetest/ParticleComponentTest/ParticleComponentTest.json"; if(cocoStudioOldApiFlag == 0){ cc.log("ccs.load : %s", file); var json = ccs.load(file); @@ -374,7 +374,7 @@ var EffectComponentTest = SceneEditorTestLayer.extend({ onEnter: function () { this._super(); var node, - file = "res/scenetest/EffectComponentTest/EffectComponentTest.json"; + file = "ccs-res/scenetest/EffectComponentTest/EffectComponentTest.json"; if(cocoStudioOldApiFlag == 0){ cc.log("ccs.load : %s", file); var json = ccs.load(file); @@ -414,7 +414,7 @@ var BackgroundComponentTest = SceneEditorTestLayer.extend({ onEnter: function () { this._super(); var node, - file = "res/scenetest/BackgroundComponentTest/BackgroundComponentTest.json"; + file = "ccs-res/scenetest/BackgroundComponentTest/BackgroundComponentTest.json"; if(cocoStudioOldApiFlag == 0){ cc.log("ccs.load : %s", file); var json = ccs.load(file); @@ -450,7 +450,7 @@ var AttributeComponentTest = SceneEditorTestLayer.extend({ onEnter: function () { this._super(); var node, - file = "res/scenetest/AttributeComponentTest/AttributeComponentTest.json"; + file = "ccs-res/scenetest/AttributeComponentTest/AttributeComponentTest.json"; if(cocoStudioOldApiFlag == 0){ cc.log("ccs.load : %s", file); var json = ccs.load(file); @@ -488,7 +488,7 @@ var TriggerTest = SceneEditorTestLayer.extend({ onEnter: function () { this._super(); var node, - file = "res/scenetest/TriggerTest/TriggerTest.json"; + file = "ccs-res/scenetest/TriggerTest/TriggerTest.json"; if(cocoStudioOldApiFlag == 0){ cc.log("ccs.load : %s", file); var json = ccs.load(file); diff --git a/tests/js-tests/src/ExtensionsTest/AssetsManagerTest/AssetsManagerTest.js b/tests/js-tests/src/ExtensionsTest/AssetsManagerTest/AssetsManagerTest.js index acd1c664fe..50e66aec79 100644 --- a/tests/js-tests/src/ExtensionsTest/AssetsManagerTest/AssetsManagerTest.js +++ b/tests/js-tests/src/ExtensionsTest/AssetsManagerTest/AssetsManagerTest.js @@ -115,12 +115,12 @@ var AssetsManagerLoaderScene = TestScene.extend({ icon.y = cc.winSize.height/2; layer.addChild(icon); - this._loadingBar = new ccui.LoadingBar("res/cocosui/sliderProgress.png"); + this._loadingBar = new ccui.LoadingBar("ccs-res/cocosui/sliderProgress.png"); this._loadingBar.x = cc.visibleRect.center.x; this._loadingBar.y = cc.visibleRect.top.y - 40; layer.addChild(this._loadingBar); - this._fileLoadingBar = new ccui.LoadingBar("res/cocosui/sliderProgress.png"); + this._fileLoadingBar = new ccui.LoadingBar("ccs-res/cocosui/sliderProgress.png"); this._fileLoadingBar.x = cc.visibleRect.center.x; this._fileLoadingBar.y = cc.visibleRect.top.y - 80; layer.addChild(this._fileLoadingBar); diff --git a/tests/js-tests/src/GUITest/UIButtonTest/UIButtonTest.js b/tests/js-tests/src/GUITest/UIButtonTest/UIButtonTest.js index 2596a4f6b5..50f90d2586 100644 --- a/tests/js-tests/src/GUITest/UIButtonTest/UIButtonTest.js +++ b/tests/js-tests/src/GUITest/UIButtonTest/UIButtonTest.js @@ -34,7 +34,7 @@ var UIButtonTest = UIScene.extend({ // Create the button var button = new ccui.Button(); button.setTouchEnabled(true); - button.loadTextures("res/cocosui/animationbuttonnormal.png", "res/cocosui/animationbuttonpressed.png", ""); + button.loadTextures("ccs-res/cocosui/animationbuttonnormal.png", "ccs-res/cocosui/animationbuttonpressed.png", ""); button.x = widgetSize.width / 2.0; button.y = widgetSize.height / 2.0; button.addTouchEventListener(this.touchEvent, this); @@ -79,7 +79,7 @@ var UIButtonTest_Scale9 = UIScene.extend({ var button = new ccui.Button(); button.setTouchEnabled(true); button.setScale9Enabled(true); - button.loadTextures("res/cocosui/button.png", "res/cocosui/buttonHighlighted.png", ""); + button.loadTextures("ccs-res/cocosui/button.png", "ccs-res/cocosui/buttonHighlighted.png", ""); button.x = this._widget.width / 2.0; button.y = this._widget.height / 2.0; button.setContentSize(cc.size(150, 48)); @@ -124,7 +124,7 @@ var UIButtonTest_PressedAction = UIScene.extend({ var button = new ccui.Button(); button.setTouchEnabled(true); button.setPressedActionEnabled(true); - button.loadTextures("res/cocosui/animationbuttonnormal.png", "res/cocosui/animationbuttonpressed.png", ""); + button.loadTextures("ccs-res/cocosui/animationbuttonnormal.png", "ccs-res/cocosui/animationbuttonpressed.png", ""); button.x = widgetSize.width / 2; button.y = widgetSize.height / 2; button.addTouchEventListener(this.touchEvent ,this); @@ -165,7 +165,7 @@ var UIButtonTest_Title = UIScene.extend({ // Create the text button var textButton = new ccui.Button(); textButton.setTouchEnabled(true); - textButton.loadTextures("res/cocosui/backtotopnormal.png", "res/cocosui/backtotoppressed.png", ""); + textButton.loadTextures("ccs-res/cocosui/backtotopnormal.png", "ccs-res/cocosui/backtotoppressed.png", ""); textButton.setTitleText("Title Button"); textButton.x = widgetSize.width / 2.0; textButton.y = widgetSize.height / 2.0; @@ -218,8 +218,8 @@ var UIButtonTestRemoveSelf = UIScene.extend({ this._mainNode.addChild(layout); // Create the button - var button = new ccui.Button("res/cocosui/animationbuttonnormal.png", - "res/cocosui/animationbuttonpressed.png"); + var button = new ccui.Button("ccs-res/cocosui/animationbuttonnormal.png", + "ccs-res/cocosui/animationbuttonpressed.png"); button.setPosition(layout.width / 2.0, layout.height / 2.0); button.addTouchEventListener(this.touchEvent, this); layout.addChild(button); @@ -264,8 +264,8 @@ var UIButtonTestSwitchScale9 = UIScene.extend({ this._bottomDisplayLabel.setString(""); // Create the button - var button = new ccui.Button("res/cocosui/animationbuttonnormal.png", - "res/cocosui/animationbuttonpressed.png"); + var button = new ccui.Button("ccs-res/cocosui/animationbuttonnormal.png", + "ccs-res/cocosui/animationbuttonpressed.png"); button.setPosition(widgetSize.width / 2.0, widgetSize.height / 2.0); button.addTouchEventListener(this.touchEvent, this); button.setTitleText("Button Title"); @@ -313,7 +313,7 @@ var UIButtonTestZoomScale = UIScene.extend({ this._bottomDisplayLabel.setString(""); // Create the button - var button = new ccui.Button("res/cocosui/animationbuttonnormal.png", "res/cocosui/animationbuttonpressed.png"); + var button = new ccui.Button("ccs-res/cocosui/animationbuttonnormal.png", "ccs-res/cocosui/animationbuttonpressed.png"); button.setPosition(widgetSize.width / 2.0, widgetSize.height / 2.0 ); button.setPressedActionEnabled(true); button.addClickEventListener(function () { @@ -324,9 +324,9 @@ var UIButtonTestZoomScale = UIScene.extend({ button.setZoomScale(-0.5); var slider = new ccui.Slider(); - slider.loadBarTexture("res/cocosui/sliderTrack.png"); - slider.loadSlidBallTextures("res/cocosui/sliderThumb.png", "res/cocosui/sliderThumb.png", ""); - slider.loadProgressBarTexture("res/cocosui/sliderProgress.png"); + slider.loadBarTexture("ccs-res/cocosui/sliderTrack.png"); + slider.loadSlidBallTextures("ccs-res/cocosui/sliderThumb.png", "ccs-res/cocosui/sliderThumb.png", ""); + slider.loadProgressBarTexture("ccs-res/cocosui/sliderProgress.png"); slider.setPosition(widgetSize.width / 2.0 , widgetSize.height / 2.0 - 50); slider.addEventListener(this.sliderEvent, this); slider.setPercent(button.getZoomScale() * 100); @@ -382,7 +382,7 @@ var UIButtonIgnoreContentSizeTest = UIScene.extend({ this._bottomDisplayLabel.setString(""); // Create the button - var button = new ccui.Button("res/cocosui/animationbuttonnormal.png", "res/cocosui/animationbuttonpressed.png"); + var button = new ccui.Button("ccs-res/cocosui/animationbuttonnormal.png", "ccs-res/cocosui/animationbuttonpressed.png"); button.ignoreContentAdaptWithSize(false); button.setContentSize(200,100); button.setNormalizedPosition(0.3, 0.5); @@ -396,7 +396,7 @@ var UIButtonIgnoreContentSizeTest = UIScene.extend({ this.addChild(button); // Create the button - var button2 = new ccui.Button("res/cocosui/animationbuttonnormal.png", "res/cocosui/animationbuttonpressed.png"); + var button2 = new ccui.Button("ccs-res/cocosui/animationbuttonnormal.png", "ccs-res/cocosui/animationbuttonpressed.png"); button2.ignoreContentAdaptWithSize(false); button2.setContentSize(200,100); button2.setNormalizedPosition(0.8, 0.5); @@ -425,10 +425,10 @@ var UIButtonTitleEffectTest = UIScene.extend({ this._bottomDisplayLabel.setString(""); // Create the button - var button = new ccui.Button("res/cocosui/animationbuttonnormal.png", "res/cocosui/animationbuttonpressed.png"); + var button = new ccui.Button("ccs-res/cocosui/animationbuttonnormal.png", "ccs-res/cocosui/animationbuttonpressed.png"); button.setNormalizedPosition(0.3, 0.5); button.setTitleText("PLAY GAME"); - //button.setTitleFontName("fonts/Marker Felt.ttf"); + //button.setTitleFontName("Marker Felt"); button.setZoomScale(0.3); button.setScale(2.0); button.setPressedActionEnabled(true); @@ -438,7 +438,7 @@ var UIButtonTitleEffectTest = UIScene.extend({ this.addChild(button); // Create the button - var button2 = new ccui.Button("res/cocosui/animationbuttonnormal.png", "res/cocosui/animationbuttonpressed.png"); + var button2 = new ccui.Button("ccs-res/cocosui/animationbuttonnormal.png", "ccs-res/cocosui/animationbuttonpressed.png"); button2.setNormalizedPosition(0.8, 0.5); button2.setTitleText("PLAY GAME"); var title2 = button2.getTitleRenderer(); @@ -459,10 +459,10 @@ var UIButtonFlipTest = UIScene.extend({ this._bottomDisplayLabel.setString(""); // Create the button - var button = new ccui.Button("res/cocosui/animationbuttonnormal.png", "res/cocosui/animationbuttonpressed.png"); + var button = new ccui.Button("ccs-res/cocosui/animationbuttonnormal.png", "ccs-res/cocosui/animationbuttonpressed.png"); button.setNormalizedPosition(0.3, 0.5); button.setTitleText("PLAY GAME"); - //button.setTitleFontName("fonts/Marker Felt.ttf"); + //button.setTitleFontName("Marker Felt"); button.setZoomScale(0.3); button.setScale(2.0); button.setFlippedX(true); @@ -474,7 +474,7 @@ var UIButtonFlipTest = UIScene.extend({ this.addChild(titleLabel); // Create the button - var button2 = new ccui.Button("res/cocosui/animationbuttonnormal.png", "res/cocosui/animationbuttonpressed.png"); + var button2 = new ccui.Button("ccs-res/cocosui/animationbuttonnormal.png", "ccs-res/cocosui/animationbuttonpressed.png"); button2.setNormalizedPosition(0.8, 0.5); button2.setTitleText("PLAY GAME"); button2.setFlippedY(true); @@ -506,14 +506,14 @@ var UIButtonNormalDefaultTest = UIScene.extend({ this._mainNode.addChild(alert); // Create the button - var button = new ccui.Button("res/cocosui/animationbuttonnormal.png"); + var button = new ccui.Button("ccs-res/cocosui/animationbuttonnormal.png"); button.setPosition(widgetSize.width / 2.0 - 80, widgetSize.height / 2.0 + 40); button.setZoomScale(0.4); button.setPressedActionEnabled(true); this._mainNode.addChild(button); // Create the button - var buttonScale9 = new ccui.Button("res/cocosui/button.png"); + var buttonScale9 = new ccui.Button("ccs-res/cocosui/button.png"); // open scale9 render buttonScale9.setScale9Enabled(true); buttonScale9.setPosition(widgetSize.width / 2.0 + 50, widgetSize.height / 2.0 + 40); @@ -541,7 +541,7 @@ var UIButtonDisableDefaultTest = UIScene.extend({ this._mainNode.addChild(alert); // Create the button - var button = new ccui.Button("res/cocosui/animationbuttonnormal.png"); + var button = new ccui.Button("ccs-res/cocosui/animationbuttonnormal.png"); button.setPosition(widgetSize.width / 2.0 - 80, widgetSize.height / 2.0 + 40); button.setZoomScale(0.4); button.setPressedActionEnabled(true); @@ -552,7 +552,7 @@ var UIButtonDisableDefaultTest = UIScene.extend({ this._mainNode.addChild(button); // Create the button - var buttonScale9 = new ccui.Button("res/cocosui/button.png"); + var buttonScale9 = new ccui.Button("ccs-res/cocosui/button.png"); // open scale9 render buttonScale9.setScale9Enabled(true); buttonScale9.setPosition(widgetSize.width / 2.0 + 50, widgetSize.height / 2.0 + 40); diff --git a/tests/js-tests/src/GUITest/UICheckBoxTest/UICheckBoxTest.js b/tests/js-tests/src/GUITest/UICheckBoxTest/UICheckBoxTest.js index 4ed941f959..0140ec0d38 100644 --- a/tests/js-tests/src/GUITest/UICheckBoxTest/UICheckBoxTest.js +++ b/tests/js-tests/src/GUITest/UICheckBoxTest/UICheckBoxTest.js @@ -34,11 +34,11 @@ var UICheckBoxTest = UIScene.extend({ // Create the checkbox var checkBox = new ccui.CheckBox(); checkBox.setTouchEnabled(true); - checkBox.loadTextures("res/cocosui/check_box_normal.png", - "res/cocosui/check_box_normal_press.png", - "res/cocosui/check_box_active.png", - "res/cocosui/check_box_normal_disable.png", - "res/cocosui/check_box_active_disable.png"); + checkBox.loadTextures("ccs-res/cocosui/check_box_normal.png", + "ccs-res/cocosui/check_box_normal_press.png", + "ccs-res/cocosui/check_box_active.png", + "ccs-res/cocosui/check_box_normal_disable.png", + "ccs-res/cocosui/check_box_active_disable.png"); checkBox.x = widgetSize.width / 2.0; checkBox.y = widgetSize.height / 2.0; checkBox.addEventListener(this.selectedStateEvent, this); @@ -85,14 +85,14 @@ var UICheckBoxDefaultBehaviorTest = UIScene.extend({ this._mainNode.addChild(alert); // Create the checkbox - var checkBox = new ccui.CheckBox("res/cocosui/check_box_normal.png", "res/cocosui/check_box_active.png"); + var checkBox = new ccui.CheckBox("ccs-res/cocosui/check_box_normal.png", "ccs-res/cocosui/check_box_active.png"); checkBox.setPosition(cc.p(widgetSize.width / 2 - 50, widgetSize.height / 2)); this._mainNode.addChild(checkBox); // Create the checkbox - var checkBox2 = new ccui.CheckBox("res/cocosui/check_box_normal.png", "res/cocosui/check_box_active.png"); + var checkBox2 = new ccui.CheckBox("ccs-res/cocosui/check_box_normal.png", "ccs-res/cocosui/check_box_active.png"); checkBox2.setPosition(cc.p(widgetSize.width / 2 - 150, widgetSize.height / 2)); checkBox2.ignoreContentAdaptWithSize(false); checkBox2.setZoomScale(0.5); @@ -102,13 +102,13 @@ var UICheckBoxDefaultBehaviorTest = UIScene.extend({ // Create the checkbox - var checkBoxDisabled = new ccui.CheckBox("res/cocosui/check_box_normal.png", "res/cocosui/check_box_active.png"); + var checkBoxDisabled = new ccui.CheckBox("ccs-res/cocosui/check_box_normal.png", "ccs-res/cocosui/check_box_active.png"); checkBoxDisabled.setPosition(cc.p(widgetSize.width / 2 + 20, widgetSize.height / 2)); checkBoxDisabled.setEnabled(false); checkBoxDisabled.setBright(false); this._mainNode.addChild(checkBoxDisabled); - var checkBoxDisabled2 = new ccui.CheckBox("res/cocosui/check_box_normal.png", "res/cocosui/check_box_active.png"); + var checkBoxDisabled2 = new ccui.CheckBox("ccs-res/cocosui/check_box_normal.png", "ccs-res/cocosui/check_box_active.png"); checkBoxDisabled2.setPosition(cc.p(widgetSize.width / 2 + 70, widgetSize.height / 2)); checkBoxDisabled2.setBright(false); checkBoxDisabled2.setSelected(true); diff --git a/tests/js-tests/src/GUITest/UIFocusTest/UIFocusTest.js b/tests/js-tests/src/GUITest/UIFocusTest/UIFocusTest.js index 6facfd3db3..7ba67664ec 100644 --- a/tests/js-tests/src/GUITest/UIFocusTest/UIFocusTest.js +++ b/tests/js-tests/src/GUITest/UIFocusTest/UIFocusTest.js @@ -128,7 +128,7 @@ var UIFocusTestHorizontal = UIFocusTestBase.extend({ var count = 3; for (var i=0; i