From f9df2984011b936cd640dc8965e40d4aac575fd3 Mon Sep 17 00:00:00 2001 From: jianglong0156 <495916729@qq.com> Date: Fri, 12 Jun 2015 18:21:07 +0800 Subject: [PATCH] modify copy resource to res/resjs --- tests/js-tests/main.js | 1 + .../src/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.js | 2 +- .../HelloCocosBuilder/HelloCocosBuilderLayer.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/js-tests/main.js b/tests/js-tests/main.js index 56c5b83d1a..a2f32210ce 100644 --- a/tests/js-tests/main.js +++ b/tests/js-tests/main.js @@ -96,6 +96,7 @@ cc.game.onStart = function(){ searchPaths.push('script'); searchPaths.push('src'); var paths = [ + 'res/resjs', 'res', 'res/scenetest', 'res/scenetest/ArmatureComponentTest', diff --git a/tests/js-tests/src/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.js b/tests/js-tests/src/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.js index b39a926a4f..dd505cf585 100644 --- a/tests/js-tests/src/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.js +++ b/tests/js-tests/src/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.js @@ -28,7 +28,7 @@ var CocosBuilderTestScene = TestScene.extend({ runThisTest:function(){ if (cc.sys.isNative) { - cc.BuilderReader.setResourcePath("res/"); + cc.BuilderReader.setResourcePath("res/resjs/"); } else { diff --git a/tests/js-tests/src/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.js b/tests/js-tests/src/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.js index a5eaf3baa4..42207825b9 100644 --- a/tests/js-tests/src/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.js +++ b/tests/js-tests/src/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.js @@ -28,7 +28,7 @@ cc.BuilderReader.registerController("HelloCocosBuilderLayer", { _openTest : function(ccbFileName) { if (cc.sys.isNative) { - cc.BuilderReader.setResourcePath("res/"); + cc.BuilderReader.setResourcePath("res/resjs/"); } else {