diff --git a/.gitignore b/.gitignore index 60d22ef..f520ba2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ rev-manifest.json /nohup.out /package-lock.json /dist.tar.gz +/roms diff --git a/fc/dist/gbajs.min.css b/fc/dist/gbajs.min.css index b183249..deaf422 100644 --- a/fc/dist/gbajs.min.css +++ b/fc/dist/gbajs.min.css @@ -526,13 +526,23 @@ canvas { right: 0; } .info-mask { - position: fixed; + position: absolute; top: 0; left: 0; - bottom: 0; - right: 0; - background-color: #fff; - background-image:url(../resources/invite-mask.png); + width: 110vw; + height: 250vw; + background-color: #000; + overflow-x: hidden; + overflow-y: auto; + background-image:url(../resources/invite-mask.jpg); background-repeat:no-repeat; background-size: 100% } +#mask-img { + width: 100%; + height: 100%; + opacity: 0; +} +.container::-webkit-scrollbar { + display: none; //Safari and Chrome +} diff --git a/fc/index.html b/fc/index.html index 9606500..854da49 100644 --- a/fc/index.html +++ b/fc/index.html @@ -54,7 +54,7 @@ diff --git a/fc/js/nes-embed.js b/fc/js/nes-embed.js index 33b5d15..d9e9fc1 100644 --- a/fc/js/nes-embed.js +++ b/fc/js/nes-embed.js @@ -151,8 +151,8 @@ window.vm = { window.onload = function(){ var gameId = getParameter("id") - var path = "http://h5games-al.kingsome.cn/emulator-static/roms/" + gameId + ".nes" - // var path = "http://192.168.100.228:7000/emu/roms/" + gameId + ".nes" + // var path = "http://h5games-al.kingsome.cn/emulator-static/roms/" + gameId + ".nes" + var path = "http://192.168.100.229:7008/roms/" + gameId + ".nes" nes_load_url("screen", path) vm.initCtrl() diff --git a/fc/resources/invite-mask.jpg b/fc/resources/invite-mask.jpg new file mode 100644 index 0000000..8f4e8d9 Binary files /dev/null and b/fc/resources/invite-mask.jpg differ diff --git a/fc/resources/invite-mask.png b/fc/resources/invite-mask.png deleted file mode 100644 index 330ffaa..0000000 Binary files a/fc/resources/invite-mask.png and /dev/null differ diff --git a/gulpfile.js b/gulpfile.js index 3f0e118..81c618c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -29,7 +29,7 @@ var gulp = require('gulp'), })) .pipe(stripDebug()) .pipe(gulp.dest('fc/dist/js')) - .pipe(notify({message: 'finished dist'})); + .pipe(notify({message: 'finished minifyjsfc'})); }); gulp.task('default', ['jslint'], function() {