diff --git a/package.json b/package.json index a4ca25c..b10e48a 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "desktop": "webpack --config ./webpack.desktop.js", "mobile": "webpack --config ./webpack.mobile.js", - "deploy:prod": "rm -f ./src/.DS_Store && aws s3 sync ./src s3://cebg.games.new --acl public-read --exclude \"pubgv4/*\" --exclude \"release/*\"", + "deploy:prod": "rm -f ./dist/.DS_Store && aws s3 sync ./dist s3://cebg.games.new --acl public-read --exclude \"pubgv4/*\" --exclude \"release/*\"", "refresh:prod": "aws cloudfront create-invalidation --distribution-id EE4HC9OXEQC7Y --paths \"/*\"" }, "author": "", diff --git a/src/desktop/nft.html b/src/desktop/nft.html index 10f4cdb..b396a8c 100755 --- a/src/desktop/nft.html +++ b/src/desktop/nft.html @@ -211,13 +211,27 @@
- - - - - - - + + + + + + + + + + + + + + + + + + + + +
@@ -609,16 +623,15 @@ }) }) function silde(_index) { + var items = $('.weapon-item-c a') + var img = $(items[_index]).data('imgdetail') mySwiper = $( '.weapon-silder .swiper-slide-active .swiper-nested-1', ).swiper({ prevButton: '.weapon-silder .swiper-slide-active .prev', nextButton: '.weapon-silder .swiper-slide-active .next', }) - $('.weapon-view .hero-d-data img').attr( - 'src', - 'img/nft/weapon/wp-0' + _index + '@2x.png', - ) + $('.weapon-view .hero-d-data img').attr('src', img) } diff --git a/src/mobile/NFT.html b/src/mobile/NFT.html index a306a2a..b3c5e6d 100755 --- a/src/mobile/NFT.html +++ b/src/mobile/NFT.html @@ -64,7 +64,7 @@
- +

Usage

@@ -180,7 +180,7 @@

- +

Usage

@@ -214,13 +214,27 @@

- - - - - - - + + + + + + + + + + + + + + + + + + + + +
@@ -233,7 +247,7 @@
- +

Usage

@@ -273,7 +287,7 @@

- + @@ -294,7 +308,7 @@
- +
@@ -566,11 +580,29 @@ var mySwiper = '' var mySwiper2 = '' $(function () { + let bodyEl = document.body + let top = 0 + + function stopBodyScroll(isFixed) { + if (isFixed) { + top = window.scrollY + + bodyEl.style.position = 'fixed' + bodyEl.style.top = -top + 'px' + } else { + bodyEl.style.position = '' + bodyEl.style.top = '' + + window.scrollTo(0, top) + } + } $('.desc-btn').click(function () { $(this).next('.desc-wrap').slideDown(250) + stopBodyScroll(true) }) $('.desc-close').click(function () { $(this).parents('.desc-wrap').slideUp(250) + stopBodyScroll(false) }) $('.hero-item-c a').click(function () { @@ -582,10 +614,12 @@ .find('.hero-d-p img') .attr('src', bigImg) $('.hero-view').find('.hero-d-data img').attr('src', imgDetail) + stopBodyScroll(true) }) $('.hero-d-close').click(function () { $(this).parents('.hero-d-layer').slideUp(250) + stopBodyScroll(false) }) $('.weapon-item-c a').click(function () { @@ -597,7 +631,7 @@ .find('.hero-d-p img') .attr('src', bigImg) $('.weapon-view').find('.hero-d-data img').attr('src', imgDetail) - + stopBodyScroll(true) mySwiper2 = $('.weapon-silder .swiper-container-0').swiper({ // loop: true, direction: 'vertical', @@ -620,16 +654,15 @@ }) }) function silde(_index) { + var items = $('.weapon-item-c a') + var img = $(items[_index]).data('imgdetail') mySwiper = $( '.weapon-silder .swiper-slide-active .swiper-nested-1', ).swiper({ prevButton: '.weapon-silder .swiper-slide-active .prev', nextButton: '.weapon-silder .swiper-slide-active .next', }) - $('.weapon-view .hero-d-data img').attr( - 'src', - 'img/nft/weapon/wp-0' + _index + '@2x.png', - ) + $('.weapon-view .hero-d-data img').attr('src', img) } diff --git a/src/mobile/css/main.css b/src/mobile/css/main.css index 8685d20..167a8d0 100755 --- a/src/mobile/css/main.css +++ b/src/mobile/css/main.css @@ -716,6 +716,7 @@ span.swiper-pagination-bullet { height: 100%; width: calc(100%); overflow-y: auto; + background: #000000bd; } .desc-wrap .desc-close { @@ -725,6 +726,10 @@ span.swiper-pagination-bullet { cursor: pointer; -webkit-tap-highlight-color:transparent; } +.desc-wrap .desc-close img{ + width: 34px; + height: 34px; +} .desc-inner { background: url('../imgMobile/nft/hero/layerbg@2x.png') no-repeat center top; @@ -738,7 +743,7 @@ span.swiper-pagination-bullet { .chip-inner { background: url("../imgMobile/nft/chip/chip-layer-bg@2x.png") no-repeat center top; - background-size: 100% auto; + background-size: 100% 100%; height: 310px; } @@ -774,6 +779,7 @@ span.swiper-pagination-bullet { height: calc(100% + 26px); width: calc(100%); overflow-y: auto; + background: #000000bd; } @@ -795,6 +801,10 @@ span.swiper-pagination-bullet { z-index: 12; -webkit-tap-highlight-color:transparent; } +.hero-d-close img{ + width: 58px; + height: 58px; +} .hero-d-p { position: absolute; diff --git a/src/mobile/imgMobile/nft/chip/chip-layer-bg1@2x.png b/src/mobile/imgMobile/nft/chip/chip-layer-bg1@2x.png new file mode 100755 index 0000000..2df8896 Binary files /dev/null and b/src/mobile/imgMobile/nft/chip/chip-layer-bg1@2x.png differ diff --git a/src/mobile/imgMobile/nft/chip/chip-layer-bg@2x.png b/src/mobile/imgMobile/nft/chip/chip-layer-bg@2x.png old mode 100755 new mode 100644 index 2df8896..2f92e0b Binary files a/src/mobile/imgMobile/nft/chip/chip-layer-bg@2x.png and b/src/mobile/imgMobile/nft/chip/chip-layer-bg@2x.png differ diff --git a/src/mobile/imgMobile/nft/hero/close2-b@2x.png b/src/mobile/imgMobile/nft/hero/close2-b@2x.png new file mode 100755 index 0000000..08b9081 Binary files /dev/null and b/src/mobile/imgMobile/nft/hero/close2-b@2x.png differ diff --git a/src/mobile/imgMobile/nft/hero/layerbg@2x.png b/src/mobile/imgMobile/nft/hero/layerbg@2x.png old mode 100755 new mode 100644 index a87ee69..f6b2003 Binary files a/src/mobile/imgMobile/nft/hero/layerbg@2x.png and b/src/mobile/imgMobile/nft/hero/layerbg@2x.png differ diff --git a/src/mobile/imgMobile/nft/weapon/close-b@2x.png b/src/mobile/imgMobile/nft/weapon/close-b@2x.png new file mode 100755 index 0000000..d797cec Binary files /dev/null and b/src/mobile/imgMobile/nft/weapon/close-b@2x.png differ diff --git a/webpack.mobile.js b/webpack.mobile.js index 9bf7628..b7ce934 100644 --- a/webpack.mobile.js +++ b/webpack.mobile.js @@ -24,6 +24,7 @@ entryFiles.map((entryFile) => { module.exports = { mode: 'production', + // mode: 'development', entry: './src/mobile/js/app.js', output: { path: path.resolve(__dirname, 'dist/mobile'),