commit

Scene/public/css/main.css

@@ -3625,10 +3625,6 @@ ul {
   top: 25%;
 }
 
-.pinTop.right,
-.ui-icon {
-  text-shadow: 0 0 5px rgba(0, 0, 0, 0.9);
-}
 
 #quick-logo {
   position: fixed;
@@ -3884,7 +3880,6 @@ a.tag-link {
 .pinBottom.left {
   z-index: 50000;
   background: rgba(0, 0, 0, 0.2);
-  border-radius: 10px;
   left: 10px;
   bottom: 10px;
 }

Scene/public/css/oldVer/main0.css

@@ -91,11 +91,11 @@ iframe {
 }
 #closepop {
   position: fixed;
-  top: 6%;
-  right: 3%;
+  top: 15%;
+  right: 16%;
   background: url(../../images/close1.png) no-repeat;
-  width: 30px;
-  height: 30px;
+  width: 50px;
+  height: 50px;
   cursor: pointer;
   text-indent: -999em;
   background-size: 100% 100%;

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>一城山色半城湖</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/changhegongyin/hot')
+    return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'https://houseoss.4dkankan.com/project/shandongMuseum/yichengshangse/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

@@ -12,25 +12,25 @@
       position: absolute;
       left: 50%;
       transform: translateX(-50%);
-      top: 30px;
+      top: 38px;
       width: 80px;
       height: 37px;
       line-height: 30px;
       text-align: center;
       font-size: 14px;
-      color: rgba(243, 230, 153, 1);
+      color: #326f64;
     }
 
     // 样式重置
     .pinBottom.left {
-      width: 1400px;
+      width: 950px;
       margin-right: 350px;
-      height: 65px;
-      border-radius: 0 40px 40px 0;
+      height: 85px;
       left: 50%;
       transform: translateX(-50%);
       background-size: contain;
-      background-color: #23362f;
+      background: url('../../assets/img/toolBar_bg.png');
+      background-size: 100% 100%;
       display: flex;
       align-items: center;
       padding-bottom: 20px;
@@ -65,15 +65,15 @@
       #gui-modes-inside,
       #gui-modes-dollhouse,
       #gui-modes-floorplan {
-        width: 35px;
-        height: 35px;
-        margin-left: 58px;
+        width: 45px;
+        height: 45px;
+        margin-left: 30px;
         background-color: transparent !important;
         position: relative;
 
         img {
-          width: 35px;
-          height: 35px;
+          width: 45px;
+          height: 45px;
         }
       }
 
@@ -88,7 +88,7 @@
       display: flex;
       justify-content: flex-end;
       align-items: center;
-      gap: 58px;
+      gap: 30px;
       .likeBox,
       .A2_map_box,
       #volume,
@@ -96,8 +96,8 @@
       #gui-fullscreen-exit,
       .A2_share_box,
       .A2_view_box {
-        width: 35px;
-        height: 35px;
+        width: 45px;
+        height: 45px;
         margin: 0;
         background-color: transparent !important;
         position: relative;
@@ -105,6 +105,10 @@
           width: 100%;
           height: 100%;
         }
+        .hasHover {
+          width: 45px;
+          height: 45px;
+        }
       }
     }
 
@@ -176,7 +180,7 @@
     #thumb-container {
       width: 100% !important;
       display: flex;
-      justify-content: flex-start;
+      justify-content: center;
       align-items: center;
       gap: 10px;
       .thumbImg {
@@ -232,8 +236,8 @@
 
     .sectionIndex {
       position: fixed;
-         top: 225px;
-    right: 10px;
+      top: 25px;
+      right: 10px;
       .sectionIndexImg {
         width: 125px;
         height: 100%;
@@ -253,12 +257,12 @@
       align-items: center;
       justify-content: center;
       z-index: 30000;
-      .arrL{
+      .arrL {
         position: absolute;
         left: 2%;
         cursor: pointer;
       }
-      .arrR{
+      .arrR {
         position: absolute;
         right: 2%;
         cursor: pointer;
@@ -267,7 +271,7 @@
         padding: 0 20px;
         width: fit-content;
         overflow: auto;
-        height: 85%;
+        height: 89%;
         width: 100%;
         display: flex;
         flex-wrap: nowrap;
@@ -284,15 +288,14 @@
         & > div {
           flex: 0 0 auto;
           width: 19%;
-          height: 70%;
+          height: 91%;
           background-size: contain;
           cursor: pointer;
           p {
-            margin-top: 220px;
-            padding: 28px;
+            margin-top: 125px;
+            padding: 38px;
             font-size: 13px;
-            font-weight: 500;
-            line-height: 25px;
+            line-height: 21px;
             text-indent: 2em;
           }
         }
@@ -300,24 +303,40 @@
           background: url(../../assets/img/section1.png) no-repeat;
           background-size: 100% 100%;
           p {
-            color: rgba(255, 244, 223, 1);
+            text-indent: 0;
+            color: #000000;
           }
         }
         .section2 {
           background: url(../../assets/img/section2.png) no-repeat;
           background-size: 100% 100%;
+          p {
+            float: right;
+            width: 80%;
+            margin-top: 265px;
+            padding: 25px;
+            color: #fff;
+          }
         }
         .section3 {
           background: url(../../assets/img/section3.png) no-repeat;
           background-size: 100% 100%;
           p {
-            color: rgba(247, 232, 207, 1);
+            float: right;
+            width: 80%;
+            margin-top: 265px;
+            padding: 25px;
+            color: #000;
           }
         }
         .section4 {
           background: url(../../assets/img/section4.png) no-repeat;
           background-size: 100% 100%;
           p {
+            float: right;
+            width: 80%;
+            margin-top: 265px;
+            padding: 25px;
             color: #fff;
           }
         }
@@ -325,13 +344,16 @@
           background: url(../../assets/img/section5.png) no-repeat;
           background-size: 100% 100%;
           p {
-            color: #fff;
+            padding: 38px;
+            margin-top: 200px;
+            color: #000;
+            text-indent: 0;
           }
         }
       }
       .sectionClose {
         position: fixed;
-        top: 25px;
+        top: 30px;
         right: 25px;
         cursor: pointer;
       }
@@ -348,7 +370,6 @@
         text-shadow: 0 0 5px rgba(253, 251, 178, 0.8), 0 0 10px rgba(253, 251, 178, 0.6);
       }
       #gui-modes-map {
-        background-color:#23362F ;
         border-radius: 25px;
         display: flex;
         justify-content: flex-end;
@@ -385,7 +406,7 @@
         background: transparent !important;
         right: 20px;
         padding: 0 !important;
-        .logo{
+        .logo {
           display: none;
         }
         .splitImg {
@@ -394,7 +415,6 @@
       }
 
       .rightViewContainer {
-        background-color:#23362F ;
         border-radius: 25px;
         margin-right: 10px;
         width: 45px;
@@ -415,7 +435,7 @@
           margin: 0;
           background-color: transparent !important;
           position: relative;
-          a {
+          .hasHover {
             width: 30px;
             height: 30px;
             img {

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

@@ -18,9 +18,10 @@
       gap: 10px;
       width: 350px;
       height: 100%;
-      background: url('../../assets/img/hotlist_bg.png') no-repeat;
-      background-size: 100% 100%;
-      color: #d3a55cd6;
+      // background: url('../../assets/img/hotlist_bg.png') no-repeat;
+      // background-size: 100% 100%;
+      background-color: #d3e6e0;
+      color: #49766b;
       font-size: 17px;
       font-weight: 500;
       padding-bottom: 70px;
@@ -30,9 +31,9 @@
       }
       .A3title {
         padding: 40px 0 10px 0;
-        font-size: 30px;
+        font-size: 26px;
         font-weight: 500;
-        color: #e6aa4a;
+        color: #39332a;
       }
       .itemBox{
         width: 93%;
@@ -64,7 +65,7 @@
         }
 
         &:hover {
-          background-color: rgba(44, 43, 42, 0.5);
+          background-color: #76aea0;
         }
       }
       }
@@ -76,7 +77,6 @@
         height: 60px;
         margin: 10px;
         background-color: transparent;
-        border-top: 1px solid rgba(43, 31, 23, 0.1);
         display: flex;
         align-items: center;
         justify-content: center;
@@ -85,9 +85,9 @@
           opacity: 1;
         }
         img {
-          width: 38px;
-          height: 38px;
-          opacity: 0.6;
+          width: 45px;
+          height: 45px;
+          opacity: 0.8;
         }
       }
     }
@@ -117,8 +117,11 @@
           .A3item {
           font-size: 18px;
           padding: 10px 3px;
+          &:hover {
+            background-color: transparent;
+          }
           &:touch {
-            background-color: rgba(163, 143, 116, 1);
+            background-color: #76aea0;
           }
         }
         }

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

@@ -20,16 +20,6 @@
     }
   }
   :global {
-    .A4base-title3 {
-      transform: translate(-50%, -420px);
-      width: 1728px;
-      height: 50px;
-    }
-    .A4base-logo {
-      transform: translate(-865px, -350px);
-      width: 100px;
-      height: 150px;
-    }
     .A4base-content {
       height: 500px;
       display: flex;
@@ -38,39 +28,11 @@
       align-items: center;
       opacity: 0;
       transform: translate(-130%, -295px);
-      .A4base-title2 {
-        width: 68%;
-        height: 100%;
-      }
-      .A4base-title1 {
-        width: 100%;
-        height: 100%;
-      }
-      .A4base-other {
-        width: 78%;
-        height: 100%;
-      }
-    }
-
-    .A4base-pic1 {
-      opacity: 0;
-     transform: translate(192%, 350px);
-    width: 325px;
-    }
-    .A4base-pic2 {
-      opacity: 0.4;
-      transform: translate(-870px, 340px);
-    width: 400px;
-    }
-     .A4base-pic3 {
-      opacity: 0;
-      transform: translate(-870px, -415px);
-    width: 450px;
     }
     .A4base-button {
       opacity: 0;
-      transform: translate(-370%, 220px);
-    width: 250px;
+      transform: translate(80%, 255px);
+    width: 300px;
     cursor: pointer;
     }
   }
@@ -99,8 +61,7 @@
     }
     .A4base-button {
       opacity: 1;
-      transform: translate(-350%, 220px);
-      transition: all 1s ease-in-out 1.5s;
+      transition: all 1s ease-in-out 0.5s;
     }
   }
 }

Scene/src/pages/A4base/index.tsx

@@ -12,29 +12,17 @@ function A4base({ show, setShow }: { show: boolean; setShow: (show: boolean) =>
   return (
     <div ref={ref} className={styles.A4base} style={{ display: show ? 'block' : 'none' }}>
       <div className='A4base-content'>
-        <div className='A4base-title1'>
-          <img src={require('./image/title.png')} alt='' />
+        <div
+          className='A4base-button'
+          onClick={() => {
+            setShow(false)
+            history.push('/home?m=mm-1579')
+            window.location.reload()
+          }}
+        >
+          <img src={require('./image/button.png')} alt='' />
         </div>
       </div>
-      <div className="A4base-pic1">
-        <img src={require('./image/other.png')} alt='' />
-      </div>
-      <div className="A4base-pic2">
-        <img src={require('./image/time.png')} alt='' />
-      </div>
-      <div className="A4base-pic3">
-        <img src={require('./image/title_2.png')} alt='' />
-      </div>
-      <div
-        className='A4base-button'
-        onClick={() => {
-          setShow(false)
-          history.push('/home?m=SG-BJIIlnvvguG-02')
-          window.location.reload()
-        }}
-      >
-        <img src={require('./image/button.png')} alt='' />
-      </div>
     </div>
   )
 }

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

@@ -47,7 +47,7 @@
     .button {
       opacity: 0;
       cursor: pointer;
-      transform: translate(-107%, 640%);
+      transform: translate(-50%, 395%);
       width: 200px;
     }
   }
@@ -75,8 +75,8 @@
     }
     .button {
       opacity: 1;
-      transform: translate(-87%, 640%);
-      transition: all 0.8s ease-in-out 1.5s;
+      transform: translate(-40%, 395%);
+      transition: all 0.8s ease-in-out 0.5s;
     }
   }
 }

Scene/src/pages/A5Mobile/index.tsx

@@ -11,23 +11,11 @@ function A5Mobile({ show, setShow }: { show: boolean; setShow: (show: boolean) =
   }, [])
   return (
     <div ref={ref} className={styles.A5Mobile} style={{ display: show ? 'block' : 'none' }}>
-      <div className='title'>
-        <img src={require('./image/title.png')} alt='' />
-      </div>
-      <div className="A5-pic1">
-        <img src={require('./image/other.png')} alt='' />
-      </div>
-      <div className="A5-pic2">
-        <img src={require('./image/time.png')} alt='' />
-      </div>
-      <div className="A5-pic3">
-        <img src={require('./image/title_1.png')} alt='' />
-      </div>
       <div
         className='button'
         onClick={() => {
           setShow(false)
-          history.push('/home?m=SG-BJIIlnvvguG-02')
+          history.push('/home?m=mm-1579')
           window.location.reload()
         }}
       >