bswl-开发

scene/public/css/oldVer/main0.css

@@ -92,13 +92,13 @@ iframe {
 #closepop {
   background: url(../../images/close1.png) no-repeat;
   background-size: 100% 100%;
-  width: 45px;
-  height: 45px;
+  width: 30px;
+  height: 30px;
   cursor: pointer;
   text-indent: -999em;
   position: absolute;
-  top: 95px;
-  right: 460px;
+  top: 100px;
+  right: 470px;
 }
 .specialTitle {
   bottom: 65%;

scene/public/index.html

@@ -8,7 +8,7 @@
     <meta name="description" content="Web site created using create-react-app" />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
 
-    <title>银雀山-汉简文化展</title>
+    <title>碧色万里——10-12世纪的草原丝绸之路</title>
 
     <!-- 大场景相关 -->
     <link rel="stylesheet" href="./css/oldVer/main0.css" />

scene/public/js/Hot.js

@@ -53,9 +53,9 @@ window.initHot = function (model) {
     var src = ''
     var r = link.substring(link.indexOf('html') + 4),
       o = 'en' == manage.number('lang') ? '&lang=' + manage.number('lang') : ''
-      ; -1 == r.indexOf('?') ? (src = link + '?time=' + randomTime().getTime() + '&id=' + window.number + o) : (src = link + '&time=' + randomTime().getTime() + '&id=' + window.number + o)
+    ;-1 == r.indexOf('?') ? (src = link + '?time=' + randomTime().getTime() + '&id=' + window.number + o) : (src = link + '&time=' + randomTime().getTime() + '&id=' + window.number + o)
 
-    return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'https://houseoss.4dkankan.com/project/shandongMuseum/yinqueshan/hot')
+    return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'https://houseoss.4dkankan.com/project/sichouMuseum/bswl/hot')
     // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8080')
     // return src
   }
@@ -341,7 +341,7 @@ window.initHot = function (model) {
         if (media) {
           this.changeShineTex(media)
         } else {
-          this.styleImg = /* this.styleImg || */[]
+          this.styleImg = /* this.styleImg || */ []
           if (this.info.styleImg) {
             this.styleImg = this.info.styleImg.map(src => {
               return { src: /* manage.dealURL( */ src } //如果要dealURL,在predeal里
@@ -429,7 +429,7 @@ window.initHot = function (model) {
         {
           let action = CloneObject(settings.hotClickEvent.shine)
           if (info.actionType == 'noAction' || info.noAction) {
-            ; (action.examine = false), (action.openHot = false)
+            ;(action.examine = false), (action.openHot = false)
           } else if (info.actionType == 'dontExam') {
             action.examine = false
           }
@@ -1135,29 +1135,29 @@ window.initHot = function (model) {
       var popup = document.getElementById('popup')
 
       if (openHot) {
-        ; (g_currentHot = this), (popup.style.display = 'block'), popup.classList.add('wait')
+        ;(g_currentHot = this), (popup.style.display = 'block'), popup.classList.add('wait')
         var n = document.createElement('iframe')
 
         SoundManager.play('hot')
 
         var src = getLink(this.info.link)
         n.src = src
-          ; (n.id = 'id1'), (n.allowTransparency = 'true')
+        ;(n.id = 'id1'), (n.allowTransparency = 'true')
         var a = document.getElementById('id1')
         if (void 0 === a || null == a) {
           document.querySelector('.popup-content').appendChild(n)
           var s = !1
-            ; (window.loaddingSuccess = function () {
-              s = !0
-            }),
-              setTimeout(function e() {
-                if (s) {
-                  var t = document.querySelector('#id1').contentWindow.document
-                  t.querySelector('video') &&
-                    (t.querySelector('video').play(), !t.querySelector('video').paused && t.querySelector('.playPause') && t.querySelector('.playPause').classList.add('fa-pause')),
-                    t.querySelector('audio') && t.querySelector('audio').play()
-                } else setTimeout(e, 300)
-              }, 800)
+          ;(window.loaddingSuccess = function () {
+            s = !0
+          }),
+            setTimeout(function e() {
+              if (s) {
+                var t = document.querySelector('#id1').contentWindow.document
+                t.querySelector('video') &&
+                  (t.querySelector('video').play(), !t.querySelector('video').paused && t.querySelector('.playPause') && t.querySelector('.playPause').classList.add('fa-pause')),
+                  t.querySelector('audio') && t.querySelector('audio').play()
+              } else setTimeout(e, 300)
+            }, 800)
         }
       }
 
@@ -1203,7 +1203,7 @@ window.initHot = function (model) {
           var f = new THREE.Matrix4().lookAt(c.position, h, new THREE.Vector3(0, 1, 0))
           p.quaternion = new THREE.Quaternion().setFromRotationMatrix(f)
         }
-        ; (p.callback = done), (p.duration = options.duration || 1500), (p.mode = 'panorama'), (p.aimDuration = options.aimDuration)
+        ;(p.callback = done), (p.duration = options.duration || 1500), (p.mode = 'panorama'), (p.aimDuration = options.aimDuration)
         player.flyToNewMode(p)
       }
     }

scene/src/pages/A2main/index.module.scss

@@ -61,6 +61,7 @@
       align-items: center;
       gap: 38px;
       .likeBox,
+      .hiddenBar,
       #volume,
       #gui-fullscreen,
       #gui-fullscreen-exit,
@@ -339,6 +340,7 @@
         gap: 30px;
         margin-bottom: -30px;
         .likeBox,
+        .hiddenBar,
         #volume,
         #gui-fullscreen,
         #gui-fullscreen-exit,

scene/src/pages/A3hotList/index.module.scss

@@ -20,7 +20,7 @@
       height: 100%;
       background: url('../../assets/img/hotlist_bg.png') center center;
       background-size: cover;
-      color: rgba(43, 31, 23, 0.9);
+      color: #F0ECE0;
       font-size: 17px;
       font-weight: 500;
       overflow: auto;
@@ -33,7 +33,7 @@
         padding: 40px 0 10px 0;
         font-size: 24px;
         font-weight: 400;
-        color: rgba(43, 31, 23, 0.9);
+        color: #F0ECE0;
       }
       .A3item {
         display: flex;
@@ -44,16 +44,15 @@
         padding: 4px 3px;
         cursor: pointer;
         &:hover {
-          background-color: rgb(182, 154, 117);
+          background-color: rgb(155, 130, 97);
         }
       }
       .A3close {
         position: fixed;
         bottom: 0;
         width: 250px;
-        height: 40px;
-        background-color: #cdc5c4;
-        border-top: 1px solid rgba(43, 31, 23, 0.1);
+        height: 60px;
+        background-color: #4d4a37;
         cursor: pointer;
         &:hover {
           opacity: 1;
@@ -101,8 +100,7 @@
         .A3close {
           width: 100%;
           height: 40px;
-          background-color: #cdc5c4;
-          border-top: 1px solid rgba(43, 31, 23, 0.1);
+          background-color: #4d4a37;
           img {
             width: 16px;
             height: 16px;

scene/src/pages/A4base/index.module.scss

@@ -37,7 +37,7 @@
       flex-direction: column;
       justify-content: center;
       align-items: center;
-      transform: translate(-65%, -325px);
+      transform: translate(-90%, -325px);
       .A4base-title2 {
         width: 68%;
         height: 100%;
@@ -53,21 +53,30 @@
     }
 
     .A4base-pic1 {
-      transform: translate(-830px, 140px);
-    width: 115px;
+      transform: translate(-80px, 0px);
+    width: 200px;
     }
     .A4base-pic2 {
-      transform: translate(-830px, 340px);
-      width: 200px;
+      transform: translate(-860px, -430px);
+    width: 150px;
     }
      .A4base-pic3 {
-      transform: translate(830px, 25px);
-      width: 80px;
+     transform: translate(-230px, -205px);
+    width: 70px;
+    }
+      .A4base-pic4 {
+          transform: translateX(-647px);
+    width: 325px;
+    top: 0;
+    }
+      .A4base-pic5 {
+      transform: translate(-78px, -333px);
+    width: 830px;
     }
     .A4base-button {
-      transform: translate(620px, 200px);
-      width: 175px;
-      cursor: pointer;
+      transform: translate(-575px, 250px);
+    width: 175px;
+    cursor: pointer;
     }
   }
 }

scene/src/pages/A4base/index.tsx

@@ -14,16 +14,22 @@ function A4base({ show, setShow }: { show: boolean; setShow: (show: boolean) =>
         <img src={require('./image/other.png')} alt='' />
       </div>
       <div className="A4base-pic2">
-        <img src={require('./image/time.png')} alt='' />
+        <img src={require('./image/logo.png')} alt='' />
       </div>
       <div className="A4base-pic3">
         <img src={require('./image/title_2.png')} alt='' />
       </div>
+      <div className="A4base-pic4">
+        <img src={require('./image/pic.png')} alt='' />
+      </div>
+      <div className="A4base-pic5">
+        <img src={require('./image/pic_2.png')} alt='' />
+      </div>
       <div
         className='A4base-button'
         onClick={() => {
           setShow(false)
-          history.push('/home?m=SG-Gs7eQXclHdT-01')
+          history.push('/home?m=SG-cZhL5llbCLb-09')
           window.location.reload()
         }}
       >

scene/src/pages/A5Mobile/index.module.scss

@@ -21,25 +21,36 @@
   }
   :global {
     .title {
-      transform: translate(-50%, -150%);
+      transform: translate(-50%, -195%);
       width: calc(100% - 40px);
     }
     .A4base-pic1 {
-      transform: translate(-233%, 160%);
-    width: 77px;
+      transform: translateY(-36%);
+      left: 30px;
+      width: 73px;
     }
     .A4base-pic2 {
-      transform: translate(-85%, 322px);
+      transform: translate(75%);
+      top: 30px;
+      width: 100px;
+    }
+    .A4base-pic3 {
+      transform: translate(-50%, -140px);
+      width: calc(100% - 50px);
+    }
+    .A4base-pic4 {
+      transform: translateX(-92%);
       width: 200px;
+      top: 0;
     }
-     .A4base-pic3 {
-      transform: translate(170%, 40px);
-    width: 70px;
+    .A4base-pic5 {
+      transform: translate(-50%, -60px);
+      width: calc(100% - 30px);
     }
     .button {
       cursor: pointer;
-      transform: translate(-50%, 229px);
-      width: 120px;
+      transform: translate(-50%, 290px);
+      width: 200px;
     }
   }
 }

scene/src/pages/A5Mobile/index.tsx

@@ -12,16 +12,22 @@ function A5Mobile({ show, setShow }: { show: boolean; setShow: (show: boolean) =
         <img src={require('./image/other.png')} alt='' />
       </div>
       <div className="A4base-pic2">
-        <img src={require('./image/time.png')} alt='' />
+        <img src={require('./image/logo.png')} alt='' />
       </div>
       <div className="A4base-pic3">
         <img src={require('./image/title_1.png')} alt='' />
       </div>
+      <div className="A4base-pic4">
+        <img src={require('./image/pic.png')} alt='' />
+      </div>
+      <div className="A4base-pic5">
+        <img src={require('./image/pic_2.png')} alt='' />
+      </div>
       <div
         className='button'
         onClick={() => {
           setShow(false)
-          history.push('/home?m=SG-Gs7eQXclHdT-01')
+          history.push('/home?m=SG-cZhL5llbCLb-09')
           window.location.reload()
         }}
       >