diff --git a/begin.html b/begin.html index 33eba50..9e3ddb4 100644 --- a/begin.html +++ b/begin.html @@ -123,7 +123,9 @@ $('.btn').click(function() { if(clickState) { - window.location.href = "game1.html?audioState=" + audioState +// window.location.href = "game1.html?audioState=" + audioState + window.location.replace("game1.html?audioState=" + audioState) +// window.open } //console.log(audioState) diff --git a/css/begin.css b/css/begin.css index ec8e8cd..1a18fe9 100644 --- a/css/begin.css +++ b/css/begin.css @@ -108,7 +108,7 @@ li { align-items: center; justify-content: center; font-size: .45rem; - margin-right:2rem; + margin-right: 2rem; margin-top: -.5rem; height: 4.5rem; font-weight: bold; @@ -121,36 +121,64 @@ li { display: none; } +.word p.contWord::-webkit-scrollbar-track-piece { + background-color: #999; + border-left: 1px solid #999; +} + +.word p.contWord::-webkit-scrollbar { + width: 1px; + height:.13rem; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; +} + +.word p.contWord::-webkit-scrollbar-thumb { + background-color: rgba(0, 0, 0, 0.5); + background-clip: padding-box; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; + min-height: pxTorem(28px); +} + +.word p.contWord::-webkit-scrollbar-thumb:hover { + background-color: rgba(0, 0, 0, 0.5); + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; +} + .bookImg .btn1 { position: absolute; left: 50%; bottom: 3%; - z-index: 99999; display: none; transform: translateX(-50%); /*background: url(../img/game2/titleIcon.png) no-repeat;*/ } -.bookImg .btn1 span{ + +.bookImg .btn1 span { font-size: .36rem; color: #fff; - display: flex; - /* margin: 0 auto; */ - justify-content: center; - align-items: flex-end; - width: 3.83rem; + display: flex; + /* margin: 0 auto; */ + justify-content: center; + align-items: flex-end; + width: 3.83rem; height: .72rem; line-height: .72rem; - position: absolute; - border-radius: 12px; - left: 50%; - bottom: 0%; - background: rgba(0,0,0,0.5); - transform: translateX(-50%); - -} -.bookImg .btn1 p{ - + position: absolute; + border-radius: 12px; + left: 50%; + bottom: 0%; + background: rgba(0, 0, 0, 0.5); + transform: translateX(-50%); +} + +.bookImg .btn1 p { width: 3.83rem; height: .72rem; background: #999; @@ -161,6 +189,7 @@ li { text-align: center; line-height: .82rem; } -.bookImg .btn1 p.active{ + +.bookImg .btn1 p.active { background: #E40006; -} +} \ No newline at end of file diff --git a/game1.html b/game1.html index bbbb3d7..faba3c0 100644 --- a/game1.html +++ b/game1.html @@ -344,7 +344,7 @@ $('.deepBtn').click(function () { var url = location.href.split('?')[1] console.log(url) - window.location.href = "game2.html?" + url + window.location.replace("game2.html?" + url) }) $('.close').on('touchstart', function () { diff --git a/game2.html b/game2.html index f031a66..04b614e 100644 --- a/game2.html +++ b/game2.html @@ -131,7 +131,7 @@