diff --git a/.gitignore b/.gitignore index a296e6935ce902ffd30f81a86f8941d1d968b265..110a6d1020236e04f97a72c278b3a568532221d8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,60 @@ /form/publish/*.zip /publish/play /node_modules -/play/build_android -/play/build_ios -/play/build_web_desktop \ No newline at end of file +/build_android +/build_ios +/build_web_desktop + +#///////////////////////////////////////////////////////////////////////////// +# Fireball Projects +#///////////////////////////////////////////////////////////////////////////// + +/library/ +/temp/ +/local/ +/build/ + +#///////////////////////////////////////////////////////////////////////////// +# npm files +#///////////////////////////////////////////////////////////////////////////// + +npm-debug.log +node_modules/ + +#///////////////////////////////////////////////////////////////////////////// +# Logs and databases +#///////////////////////////////////////////////////////////////////////////// + +*.log +*.sql +*.sqlite + +#///////////////////////////////////////////////////////////////////////////// +# files for debugger +#///////////////////////////////////////////////////////////////////////////// + +*.sln +*.csproj +*.pidb +*.unityproj +*.suo + +#///////////////////////////////////////////////////////////////////////////// +# OS generated files +#///////////////////////////////////////////////////////////////////////////// + +.DS_Store +ehthumbs.db +Thumbs.db + +#///////////////////////////////////////////////////////////////////////////// +# WebStorm files +#///////////////////////////////////////////////////////////////////////////// + +.idea/ + +#////////////////////////// +# VS Code files +#////////////////////////// + +.vscode/ diff --git a/play/assets/cocos_generator.meta b/assets/cocos_generator.meta similarity index 100% rename from play/assets/cocos_generator.meta rename to assets/cocos_generator.meta diff --git a/play/assets/cocos_generator/audios.meta b/assets/cocos_generator/audios.meta similarity index 100% rename from play/assets/cocos_generator/audios.meta rename to assets/cocos_generator/audios.meta diff --git a/play/assets/cocos_generator/audios/.keep b/assets/cocos_generator/audios/.keep similarity index 100% rename from play/assets/cocos_generator/audios/.keep rename to assets/cocos_generator/audios/.keep diff --git a/play/assets/cocos_generator/audios/btn.mp3 b/assets/cocos_generator/audios/btn.mp3 similarity index 100% rename from play/assets/cocos_generator/audios/btn.mp3 rename to assets/cocos_generator/audios/btn.mp3 diff --git a/play/assets/cocos_generator/audios/btn.mp3.meta b/assets/cocos_generator/audios/btn.mp3.meta similarity index 100% rename from play/assets/cocos_generator/audios/btn.mp3.meta rename to assets/cocos_generator/audios/btn.mp3.meta diff --git a/play/assets/cocos_generator/dragonBones.meta b/assets/cocos_generator/dragonBones.meta similarity index 100% rename from play/assets/cocos_generator/dragonBones.meta rename to assets/cocos_generator/dragonBones.meta diff --git a/play/assets/cocos_generator/dragonBones/.keep b/assets/cocos_generator/dragonBones/.keep similarity index 100% rename from play/assets/cocos_generator/dragonBones/.keep rename to assets/cocos_generator/dragonBones/.keep diff --git a/play/assets/cocos_generator/fonts.meta b/assets/cocos_generator/fonts.meta similarity index 100% rename from play/assets/cocos_generator/fonts.meta rename to assets/cocos_generator/fonts.meta diff --git a/play/assets/cocos_generator/fonts/.keep b/assets/cocos_generator/fonts/.keep similarity index 100% rename from play/assets/cocos_generator/fonts/.keep rename to assets/cocos_generator/fonts/.keep diff --git a/play/assets/cocos_generator/fonts/BRLNSDB.TTF b/assets/cocos_generator/fonts/BRLNSDB.TTF similarity index 100% rename from play/assets/cocos_generator/fonts/BRLNSDB.TTF rename to assets/cocos_generator/fonts/BRLNSDB.TTF diff --git a/play/assets/cocos_generator/fonts/BRLNSDB.TTF.meta b/assets/cocos_generator/fonts/BRLNSDB.TTF.meta similarity index 100% rename from play/assets/cocos_generator/fonts/BRLNSDB.TTF.meta rename to assets/cocos_generator/fonts/BRLNSDB.TTF.meta diff --git a/play/assets/cocos_generator/scene.meta b/assets/cocos_generator/scene.meta similarity index 100% rename from play/assets/cocos_generator/scene.meta rename to assets/cocos_generator/scene.meta diff --git a/play/assets/cocos_generator/scene/cocos_generator.fire b/assets/cocos_generator/scene/cocos_generator.fire similarity index 100% rename from play/assets/cocos_generator/scene/cocos_generator.fire rename to assets/cocos_generator/scene/cocos_generator.fire diff --git a/play/assets/cocos_generator/scene/cocos_generator.fire.meta b/assets/cocos_generator/scene/cocos_generator.fire.meta similarity index 100% rename from play/assets/cocos_generator/scene/cocos_generator.fire.meta rename to assets/cocos_generator/scene/cocos_generator.fire.meta diff --git a/play/assets/cocos_generator/scene/cocos_generator.ts b/assets/cocos_generator/scene/cocos_generator.ts similarity index 100% rename from play/assets/cocos_generator/scene/cocos_generator.ts rename to assets/cocos_generator/scene/cocos_generator.ts diff --git a/play/assets/cocos_generator/scene/cocos_generator.ts.meta b/assets/cocos_generator/scene/cocos_generator.ts.meta similarity index 100% rename from play/assets/cocos_generator/scene/cocos_generator.ts.meta rename to assets/cocos_generator/scene/cocos_generator.ts.meta diff --git a/play/assets/cocos_generator/script.meta b/assets/cocos_generator/script.meta similarity index 100% rename from play/assets/cocos_generator/script.meta rename to assets/cocos_generator/script.meta diff --git a/play/assets/cocos_generator/script/MyCocosSceneComponent.ts b/assets/cocos_generator/script/MyCocosSceneComponent.ts similarity index 100% rename from play/assets/cocos_generator/script/MyCocosSceneComponent.ts rename to assets/cocos_generator/script/MyCocosSceneComponent.ts diff --git a/play/assets/cocos_generator/script/MyCocosSceneComponent.ts.meta b/assets/cocos_generator/script/MyCocosSceneComponent.ts.meta similarity index 100% rename from play/assets/cocos_generator/script/MyCocosSceneComponent.ts.meta rename to assets/cocos_generator/script/MyCocosSceneComponent.ts.meta diff --git a/play/assets/cocos_generator/script/defaultData.ts b/assets/cocos_generator/script/defaultData.ts similarity index 100% rename from play/assets/cocos_generator/script/defaultData.ts rename to assets/cocos_generator/script/defaultData.ts diff --git a/play/assets/cocos_generator/script/defaultData.ts.meta b/assets/cocos_generator/script/defaultData.ts.meta similarity index 100% rename from play/assets/cocos_generator/script/defaultData.ts.meta rename to assets/cocos_generator/script/defaultData.ts.meta diff --git a/play/assets/cocos_generator/script/runtime.js b/assets/cocos_generator/script/runtime.js similarity index 100% rename from play/assets/cocos_generator/script/runtime.js rename to assets/cocos_generator/script/runtime.js diff --git a/play/assets/cocos_generator/script/runtime.js.meta b/assets/cocos_generator/script/runtime.js.meta similarity index 100% rename from play/assets/cocos_generator/script/runtime.js.meta rename to assets/cocos_generator/script/runtime.js.meta diff --git a/play/assets/cocos_generator/script/util.ts b/assets/cocos_generator/script/util.ts similarity index 100% rename from play/assets/cocos_generator/script/util.ts rename to assets/cocos_generator/script/util.ts diff --git a/play/assets/cocos_generator/script/util.ts.meta b/assets/cocos_generator/script/util.ts.meta similarity index 100% rename from play/assets/cocos_generator/script/util.ts.meta rename to assets/cocos_generator/script/util.ts.meta diff --git a/play/assets/cocos_generator/textures.meta b/assets/cocos_generator/textures.meta similarity index 100% rename from play/assets/cocos_generator/textures.meta rename to assets/cocos_generator/textures.meta diff --git a/play/assets/cocos_generator/textures/.keep b/assets/cocos_generator/textures/.keep similarity index 100% rename from play/assets/cocos_generator/textures/.keep rename to assets/cocos_generator/textures/.keep diff --git a/play/assets/cocos_generator/textures/1orange.png b/assets/cocos_generator/textures/1orange.png similarity index 100% rename from play/assets/cocos_generator/textures/1orange.png rename to assets/cocos_generator/textures/1orange.png diff --git a/play/assets/cocos_generator/textures/1orange.png.meta b/assets/cocos_generator/textures/1orange.png.meta similarity index 100% rename from play/assets/cocos_generator/textures/1orange.png.meta rename to assets/cocos_generator/textures/1orange.png.meta diff --git a/play/assets/cocos_generator/textures/bg.jpg b/assets/cocos_generator/textures/bg.jpg similarity index 100% rename from play/assets/cocos_generator/textures/bg.jpg rename to assets/cocos_generator/textures/bg.jpg diff --git a/play/assets/cocos_generator/textures/bg.jpg.meta b/assets/cocos_generator/textures/bg.jpg.meta similarity index 100% rename from play/assets/cocos_generator/textures/bg.jpg.meta rename to assets/cocos_generator/textures/bg.jpg.meta diff --git a/play/assets/cocos_generator/textures/btn_left.png b/assets/cocos_generator/textures/btn_left.png similarity index 100% rename from play/assets/cocos_generator/textures/btn_left.png rename to assets/cocos_generator/textures/btn_left.png diff --git a/play/assets/cocos_generator/textures/btn_left.png.meta b/assets/cocos_generator/textures/btn_left.png.meta similarity index 100% rename from play/assets/cocos_generator/textures/btn_left.png.meta rename to assets/cocos_generator/textures/btn_left.png.meta diff --git a/play/assets/cocos_generator/textures/btn_right.png b/assets/cocos_generator/textures/btn_right.png similarity index 100% rename from play/assets/cocos_generator/textures/btn_right.png rename to assets/cocos_generator/textures/btn_right.png diff --git a/play/assets/cocos_generator/textures/btn_right.png.meta b/assets/cocos_generator/textures/btn_right.png.meta similarity index 100% rename from play/assets/cocos_generator/textures/btn_right.png.meta rename to assets/cocos_generator/textures/btn_right.png.meta diff --git a/play/assets/cocos_generator/textures/icon.png b/assets/cocos_generator/textures/icon.png similarity index 100% rename from play/assets/cocos_generator/textures/icon.png rename to assets/cocos_generator/textures/icon.png diff --git a/play/assets/cocos_generator/textures/icon.png.meta b/assets/cocos_generator/textures/icon.png.meta similarity index 100% rename from play/assets/cocos_generator/textures/icon.png.meta rename to assets/cocos_generator/textures/icon.png.meta diff --git a/bin/app.js b/bin/app.js index 7e5c5baa72dda9d1030eb075525baada58cc53e5..24bab80fa50e4038609006d4b595d0d9b434d577 100644 --- a/bin/app.js +++ b/bin/app.js @@ -34,8 +34,7 @@ var server = app.listen(8081, function () { console.log("http://%s:%s/dist/play/index.html", host, port) console.log("http://%s:%s/dist/play/index.html", "localhost", port) console.log('-----------------'); - console.log(" 输入 build 构建全部脚本"); - console.log(" 输入 build android 构建安å“脚本"); + console.log(" 输入 build 构建安å“脚本"); console.log(" 输入 build ios 构建IOS脚本"); console.log('-----------------'); @@ -47,8 +46,6 @@ const rl = readline.createInterface({ }) rl.on('line', async (str) => { if (str.trim() == 'build') { - await build(); - } else if (str.trim() == 'build android') { await buildAndroid(); } else if (str.trim() == 'build ios') { await buildIos(); diff --git a/bin/buildCocos.js b/bin/buildCocos.js index 3202abb30ac8c90b697799610503c5ddc1be318c..7ae80bc938ec3a4a2f46471db373cf52d31546d6 100644 --- a/bin/buildCocos.js +++ b/bin/buildCocos.js @@ -61,7 +61,7 @@ const buildCocos = function (args) { const buffer = spawn( creatorBasePath, args, - { cwd: 'play' } + { cwd: '.' } ); buffer.stdout.on('data', (data) => { @@ -166,7 +166,7 @@ function compressAll (projectName) { function build_check () { const dirNames = process.cwd().split(/\/|\\/); const projectName = dirNames[dirNames.length - 1]; - const path = 'play/assets' + const path = 'assets' let folderName = ''; fs.readdirSync(path).find(fileName => { const st = fs.statSync(`${path}/${fileName}`); @@ -199,13 +199,13 @@ function build_check () { } function changeSettingToWebDesktop () { - const path = 'play/assets' + const path = 'assets' const folderName = getFolderName(path); editFolderMeta(path, folderName, false); } function changeSettingsToBundle () { - const path = 'play/assets' + const path = 'assets' const folderName = getFolderName(path); editFolderMeta(path, folderName, true); } @@ -242,15 +242,15 @@ function replaceUuids () { fs.writeFileSync(path, newFileStr); } - const path = 'play/assets' + const path = 'assets' const folderName = getFolderName(path); editFolderMeta(path, folderName); const oldFireUuid = '57ea7c61-9b8b-498a-b024-c98ee9124beb'; const newFireUuid = v4(); - fileReplace(`play/assets/${folderName}/scene/${folderName}.fire.meta`, oldFireUuid, newFireUuid); - fileReplace(`play/assets/${folderName}/scene/${folderName}.fire`, oldFireUuid, newFireUuid); - fileReplace('play/settings/builder.json', oldFireUuid, newFireUuid); + fileReplace(`assets/${folderName}/scene/${folderName}.fire.meta`, oldFireUuid, newFireUuid); + fileReplace(`assets/${folderName}/scene/${folderName}.fire`, oldFireUuid, newFireUuid); + fileReplace('settings/builder.json', oldFireUuid, newFireUuid); function getShortUuid(uuid) { @@ -264,16 +264,16 @@ function replaceUuids () { const newJsUuid = v4(); const newJsShortUuid = getShortUuid(newJsUuid); const newJsId = v4().replace(/-/g, '').substring(0, oldJsId.length); - fileReplace(`play/assets/${folderName}/scene/${folderName}.ts.meta`, oldJsUuid, newJsUuid); - fileReplace(`play/assets/${folderName}/scene/${folderName}.fire`, oldFireUuid, newFireUuid); - fileReplace(`play/assets/${folderName}/scene/${folderName}.fire`, oldJsShortUuid, newJsShortUuid); - fileReplace(`play/assets/${folderName}/scene/${folderName}.fire`, oldJsId, newJsId); + fileReplace(`assets/${folderName}/scene/${folderName}.ts.meta`, oldJsUuid, newJsUuid); + fileReplace(`assets/${folderName}/scene/${folderName}.fire`, oldFireUuid, newFireUuid); + fileReplace(`assets/${folderName}/scene/${folderName}.fire`, oldJsShortUuid, newJsShortUuid); + fileReplace(`assets/${folderName}/scene/${folderName}.fire`, oldJsId, newJsId); console.log('build_step_0 完æˆ~ï¼'); } function replaceIndexHtml () { - const data = fs.readFileSync('play/index.html'); + const data = fs.readFileSync('index.html'); fs.writeFileSync('dist/play/index.html', data); } @@ -301,7 +301,7 @@ module.exports = { // 构建play await removeDir('dist/play'); await buildWebDesktop(); - await copyDir('play/build/web-desktop', 'dist/play'); + await copyDir('build/web-desktop', 'dist/play'); replaceIndexHtml(); console.log('构建 web desktop æˆåŠŸï¼'); @@ -310,17 +310,17 @@ module.exports = { await removeDir('dist/android'); await buildAndroidBundle(); - await copyDir('play/build_android/jsb-link/remote', 'dist/android'); + await copyDir('build_android/jsb-link/remote', 'dist/android'); console.log('构建 android bundle æˆåŠŸï¼'); await removeDir('dist/ios'); await buildIosBundle(); - await copyDir('play/build_ios/jsb-link/remote', 'dist/ios'); + await copyDir('build_ios/jsb-link/remote', 'dist/ios'); console.log('构建 ios bundle æˆåŠŸï¼'); await removeDir('dist/web_desktop'); await buildWebBundle(); - await copyDir(`play/build_web_desktop/web-desktop/assets/${projectName}`, 'dist/web_desktop'); + await copyDir(`build_web_desktop/web-desktop/assets/${projectName}`, 'dist/web_desktop'); console.log('构建 web bundle æˆåŠŸï¼'); // 改设置为éžbundle @@ -329,7 +329,12 @@ module.exports = { createConfigFile(projectName); compressAll(projectName); - + + await removeDir('build'); + await removeDir('build_android'); + await removeDir('build_ios'); + await removeDir('build_web_desktop'); + const endTime = new Date().getTime(); const duration = new Date(endTime - startTime); console.log(`打包完æˆï¼`); @@ -342,11 +347,13 @@ module.exports = { await removeDir('dist/android'); await buildAndroidBundle(); - await copyDir('play/build_android/jsb-link/remote', 'dist/android'); + await copyDir('build_android/jsb-link/remote', 'dist/android'); console.log('构建 android bundle æˆåŠŸï¼'); // 改设置为éžbundle changeSettingToWebDesktop(); + + await removeDir('build_android'); }, buildIos: async function () { @@ -355,11 +362,12 @@ module.exports = { await removeDir('dist/ios'); await buildIosBundle(); - await copyDir('play/build_ios/jsb-link/remote', 'dist/ios'); + await copyDir('build_ios/jsb-link/remote', 'dist/ios'); console.log('构建 ios bundle æˆåŠŸï¼'); // 改设置为éžbundle changeSettingToWebDesktop(); + await removeDir('build_ios'); } }; diff --git a/play/creator.d.ts b/creator.d.ts similarity index 100% rename from play/creator.d.ts rename to creator.d.ts diff --git a/play/index.html b/index.html similarity index 100% rename from play/index.html rename to index.html diff --git a/play/jsconfig.json b/jsconfig.json similarity index 100% rename from play/jsconfig.json rename to jsconfig.json diff --git a/play/.gitignore b/play/.gitignore deleted file mode 100644 index c072d29adcca12daa3412d534483817b1c77c77f..0000000000000000000000000000000000000000 --- a/play/.gitignore +++ /dev/null @@ -1,53 +0,0 @@ -#///////////////////////////////////////////////////////////////////////////// -# Fireball Projects -#///////////////////////////////////////////////////////////////////////////// - -/library/ -/temp/ -/local/ -/build/ - -#///////////////////////////////////////////////////////////////////////////// -# npm files -#///////////////////////////////////////////////////////////////////////////// - -npm-debug.log -node_modules/ - -#///////////////////////////////////////////////////////////////////////////// -# Logs and databases -#///////////////////////////////////////////////////////////////////////////// - -*.log -*.sql -*.sqlite - -#///////////////////////////////////////////////////////////////////////////// -# files for debugger -#///////////////////////////////////////////////////////////////////////////// - -*.sln -*.csproj -*.pidb -*.unityproj -*.suo - -#///////////////////////////////////////////////////////////////////////////// -# OS generated files -#///////////////////////////////////////////////////////////////////////////// - -.DS_Store -ehthumbs.db -Thumbs.db - -#///////////////////////////////////////////////////////////////////////////// -# WebStorm files -#///////////////////////////////////////////////////////////////////////////// - -.idea/ - -#////////////////////////// -# VS Code files -#////////////////////////// - -.vscode/ diff --git a/play/project.json b/project.json similarity index 100% rename from play/project.json rename to project.json diff --git a/play/settings/builder.json b/settings/builder.json similarity index 100% rename from play/settings/builder.json rename to settings/builder.json diff --git a/play/settings/project.json b/settings/project.json similarity index 100% rename from play/settings/project.json rename to settings/project.json diff --git a/play/settings/services.json b/settings/services.json similarity index 100% rename from play/settings/services.json rename to settings/services.json diff --git a/play/tsconfig.json b/tsconfig.json similarity index 100% rename from play/tsconfig.json rename to tsconfig.json