diff --git a/assets/scripts/BaseNet.js b/assets/scripts/BaseNet.js index fa0d21f3..d6427840 100644 --- a/assets/scripts/BaseNet.js +++ b/assets/scripts/BaseNet.js @@ -16,12 +16,12 @@ function isDevEnv() { } function isExamining() { - console.log("currentpackage:"+mainConfig.packageid) + if(!isDevEnv() && isTest && mainConfig.packageid!=0 ){ - console.log("test") + return true }else{ - console.log("no test") + return false } } diff --git a/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/app/build.gradle b/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/app/build.gradle index 590fca52..2d8d0188 100644 --- a/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/app/build.gradle +++ b/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/app/build.gradle @@ -27,10 +27,9 @@ android { // skip the NDK Build step if PROP_NDK_MODE is none targets 'cocos2djs' arguments 'NDK_TOOLCHAIN_VERSION=clang' - - def module_paths = [project.file("/Applications/CocosCreator.app/Contents/Resources/cocos2d-x"), - project.file("/Applications/CocosCreator.app/Contents/Resources/cocos2d-x/cocos"), - project.file("/Applications/CocosCreator.app/Contents/Resources/cocos2d-x/external")] + def module_paths = [project.file("D:/installs/CocosCreator2.10/resources/cocos2d-x"), + project.file("D:/installs/CocosCreator2.10/resources/cocos2d-x/cocos"), + project.file("D:/installs/CocosCreator2.10/resources/cocos2d-x/external")] if (Os.isFamily(Os.FAMILY_WINDOWS)) { arguments 'NDK_MODULE_PATH=' + module_paths.join(";") }