diff --git a/fc/css/fc.css b/fc/css/fc.css index 6b58ade..ec83090 100644 --- a/fc/css/fc.css +++ b/fc/css/fc.css @@ -71,7 +71,7 @@ mark { left:0; top:0; z-index:95; - background:rgba(0,0,0,.7) + background:rgba(0,0,0,.7); } .tx_ov { overflow:hidden; @@ -536,7 +536,8 @@ canvas { overflow-y: auto; background-image:url(../images/invite-mask.jpg); background-repeat:no-repeat; - background-size: 100% + background-size: 100%; + z-index: 11; } #mask-img { width: 100%; diff --git a/tasks/dist.js b/tasks/dist.js index 63a3036..ee05e7a 100644 --- a/tasks/dist.js +++ b/tasks/dist.js @@ -6,7 +6,8 @@ var gulp = require('gulp'), jshint = require('gulp-jshint'), stripDebug = require("gulp-strip-debug"),//移除console语句 cleanCSS = require('gulp-clean-css'), - gutil = require('gulp-util'); + gutil = require('gulp-util'), + fc = require('./fc'); const javascriptObfuscator = require('gulp-javascript-obfuscator'); const obfuscatorOptions = { compact:true, @@ -27,28 +28,7 @@ gulp.task('disthtml', function(){ return gulp.src(['**/*.html', '!node_modules/**/*', '!dist/**/*']) .pipe(gulp.dest('dist')); }) -//处理fc的css -gulp.task('distfccss', function() { - return gulp.src(['fc/css/**/*.css']) - .pipe(cleanCSS()) - .pipe(gulp.dest('dist/fc/css')); -}) -//处理fc的图片资源 -gulp.task('distfcstatic', function() { - return gulp.src(['fc/resources/**/*']) - .pipe(gulp.dest('dist/fc/resources')); -}) -gulp.task('distfclib', function() { - return gulp.src(['fc/lib/**/*']) - .pipe(gulp.dest('dist/fc/lib')); -}) -gulp.task('distfcjs', function() { - return gulp.src(['fc/js/**/*.js']) - .pipe(javascriptObfuscator(obfuscatorOptions)) - .pipe(stripDebug()) - .pipe(gulp.dest('dist/fc/js')); -}); -gulp.task('distfc', ['distfcjs', 'distfccss', 'distfcstatic', 'distfclib']) + gulp.task('distgbajs', function() { return gulp.src(['gba/dist/*.js']) diff --git a/tasks/fc2.js b/tasks/fc.js similarity index 73% rename from tasks/fc2.js rename to tasks/fc.js index 430696c..04f9dc4 100644 --- a/tasks/fc2.js +++ b/tasks/fc.js @@ -19,35 +19,35 @@ const obfuscatorOptions = { //处理fc的css gulp.task('distfccss', function() { - return gulp.src(['fc2/css/**/*.css']) + return gulp.src(['fc/css/**/*.css']) .pipe(cleanCSS()) - .pipe(gulp.dest('dist/fc2/css')); + .pipe(gulp.dest('dist/fc/css')); }) //处理fc的图片资源 gulp.task('distfcstatic', function() { - return gulp.src(['fc2/images/**/*']) - .pipe(gulp.dest('dist/fc2/images')); + return gulp.src(['fc/images/**/*']) + .pipe(gulp.dest('dist/fc/images')); }) gulp.task('distfcresource', function() { - return gulp.src(['fc2/resources/**/*']) - .pipe(gulp.dest('dist/fc2/resources')); + return gulp.src(['fc/resources/**/*']) + .pipe(gulp.dest('dist/fc/resources')); }) gulp.task('distfcjs', function() { - return gulp.src(['fc2/js/**/*.js', '!fc2/js/nes-worker.js']) + return gulp.src(['fc/js/**/*.js', '!fc/js/nes-worker.js']) .pipe(javascriptObfuscator(obfuscatorOptions)) .pipe(concat('main.min.js')) - .pipe(gulp.dest('dist/fc2/js')); + .pipe(gulp.dest('dist/fc/js')); }); gulp.task('distotherjs', function() { - return gulp.src(['fc2/js/nes-worker.js']) + return gulp.src(['fc/js/nes-worker.js']) .pipe(javascriptObfuscator(obfuscatorOptions)) - .pipe(gulp.dest('dist/fc2/js')); + .pipe(gulp.dest('dist/fc/js')); }); gulp.task('distlib', function () { - return gulp.src('fc2/source/index.js') + return gulp.src('fc/source/index.js') .pipe(browserify({ insertGlobals : false, debug: false, @@ -55,7 +55,7 @@ gulp.task('distlib', function () { })) .pipe(javascriptObfuscator(obfuscatorOptions)) .pipe(rename('jsnes.min.js')) - .pipe(gulp.dest('dist/fc2/js/')); + .pipe(gulp.dest('dist/fc/js/')); }); gulp.task('distfc', ['distfcjs', 'distfccss', 'distfcstatic', 'distlib', 'distfcresource', 'distotherjs'])