commit

Hot/src/views/Home.vue

@@ -302,19 +302,19 @@ export default {
     width: 100%;
     margin: 0 auto;
     height: 100%;
-    padding: 30px 50px 20px 20px;
+    padding: 106px 44px 41px 44px;
     display: flex;
     align-items: center;
     flex-direction: column;
 
     justify-content: center;
     .myTitle {
-      font-size: 22px;
+      font-size: 26px;
       font-weight: 700;
       margin-bottom: 20px;
       padding: 0 30px;
       letter-spacing: 4px;
-      color: #fff;
+      color: #694c31;
     }
     .fixedTx {
       font-size: 14px;
@@ -416,6 +416,7 @@ export default {
     .txtBox {
       height: 0;
       flex: 1;
+      width: 90%;
       .flooTxt {
         margin: 0 auto;
         margin-top: 10px;
@@ -430,7 +431,7 @@ export default {
 
           .myTxt {
             font-size: 16px;
-            color: #f9f9f1;
+            color: #694c31;
             letter-spacing: 3px;
             line-height: 32px;
           }
@@ -516,7 +517,7 @@ export default {
     .main {
       width: 100%;
       height: 100%;
-      padding: 0;
+      padding: 16% 0 0 0;
       position: absolute;
       .myTitle {
         font-size: 16px;
@@ -526,6 +527,7 @@ export default {
         border-radius: 0;
         height: calc(100% - 300px);
         width: 100%;
+        margin-top: 0;
 
         .contenBox {
           .videoBox {

Scene/public/css/oldVer/main0.css

@@ -97,8 +97,8 @@ iframe {
   text-indent: -999em;
   background-size: 100% 100%;
   position: absolute;
-  top: 80px;
-  right: 200px;
+  top: 110px;
+  right: 230px;
 }
 .specialTitle {
   bottom: 65%;
@@ -235,7 +235,7 @@ a {
     width: 30px;
     height: 30px;
     position: absolute;
-    top: 70px;
+    top: 11%;
     right: 25px;
   }
 

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

@@ -55,8 +55,8 @@ window.initHot = function (model) {
       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)
 
-    return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'https://houseoss.4dkankan.com/project/WuhanMuseum/hot')
-    // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8080')
+    return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'https://houseoss.4dkankan.com/project/hubeiMuseum/hbgdwm/hot')
+    // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8083')
     // return src
   }
   var removeSrcPostMark = function (url) {

Scene/public/showa/js/loadCAD.js

@@ -38,7 +38,6 @@ window.grendCAD = (function grendCAD() {
     let style = document.createElement('style')
     style.innerHTML = `
       .cad {
-        cursor: pointer;
         position: absolute;
         right: 20px;
         top: 16px;
@@ -46,10 +45,6 @@ window.grendCAD = (function grendCAD() {
         height: 200px;
         background: rgba(0, 0, 0, .3);
         border-radius: 5px; 
-        background-image: url('./images/map_1.png');
-        path {
-          opacity: 0;
-        }
         g.sign>path {
           opacity: 1;
         }
@@ -80,11 +75,6 @@ window.grendCAD = (function grendCAD() {
             height: 100px;
             background: rgba(0, 0, 0, .3);
             border-radius: 5px;
-            background-image: url('./images/map_1.png');
-            background-size: cover;
-            path {
-              opacity: 0;
-            }
             g.sign>path {
               opacity: 1;
             }
@@ -134,11 +124,11 @@ window.grendCAD = (function grendCAD() {
     loadScript(function () {
       let [$layer, $img] = loadDOM($parent)
 
-      $layer.addEventListener('click', () => {
-        console.log(12)
-        $img.src = './images/map_2.png'
-        $img.style.display = $img.style.display === 'block' ? 'none' : 'block'
-      })
+      // $layer.addEventListener('click', () => {
+      //   console.log(12)
+      //   $img.src = './images/map_2.png'
+      //   $img.style.display = $img.style.display === 'block' ? 'none' : 'block'
+      // })
 
       $layer.style.visibility = 'hidden'
       window.cad = structureCAD({

Scene/src/pages/A0base/index.tsx

@@ -1,18 +1,13 @@
 import React, { useState } from 'react'
 import isMobile from '../../utils/isMobile'
-import A5Mobile from '../A5Mobile'
-import A4base from '../A4base'
+import A1home from '../A1home'
 import styles from './index.module.scss'
 function A0base() {
   const [show, setShow] = useState(true)
   return (
     <>
       {/* 初始封面 */}
-      {isMobile() ? (
-        <A5Mobile show={show} setShow={setShow} />
-      ) : (
-        <A4base show={show} setShow={setShow} />
-      )}
+      <A1home/>
     </>
   )
 }

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

@@ -18,7 +18,7 @@
       line-height: 30px;
       text-align: center;
       font-size: 14px;
-      color: #fff;
+      color: #ffe3cc;
     }
 
     // 样式重置
@@ -65,6 +65,7 @@
       #gui-fullscreen,
       #gui-fullscreen-exit,
       .A2_share_box,
+      .sectionIndex,
       .A2_view_box {
         width: 48px;
         height: 48px;
@@ -74,6 +75,7 @@
         img {
           width: 100%;
           height: 100%;
+          object-fit: contain;
         }
       }
     }
@@ -197,6 +199,93 @@
       }
     }
 
+    .section {
+      position: fixed;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      width: 100%;
+      height: 100%;
+      background-color: rgba(0, 0, 0, 0.5);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      z-index: 30000;
+      .arrL {
+        position: absolute;
+        left: 2%;
+        cursor: pointer;
+      }
+      .arrR {
+        position: absolute;
+        right: 2%;
+        cursor: pointer;
+      }
+      .sectionBox {
+        padding: 0 20px;
+        width: fit-content;
+        overflow: auto;
+        height: 89%;
+        width: 100%;
+        display: flex;
+        flex-wrap: nowrap;
+        scroll-behavior: smooth;
+        justify-content: center;
+        align-items: center;
+        gap: 20px;
+        ::-webkit-scrollbar {
+          display: none; /* Chrome, Safari, Edge */
+        }
+        -ms-overflow-style: none; /* IE and Edge */
+        scrollbar-width: none; /* Firefox */
+
+        & > div {
+          flex: 0 0 auto;
+          width: 19%;
+          height: 91%;
+          background-size: contain;
+          cursor: pointer;
+          p {
+            margin-top: 380px;
+            padding: 38px;
+            padding-right: 78px;
+            font-size: 13px;
+            line-height: 21px;
+            font-weight: lighter;
+            text-indent: 2em;
+            color: #faf6e8;
+            letter-spacing: 1px;
+          }
+        }
+        .section1 {
+          background: url(../../assets/img/section1.png) no-repeat;
+          background-size: 100% 100%;
+        }
+        .section2 {
+          background: url(../../assets/img/section2.png) no-repeat;
+          background-size: 100% 100%;
+        }
+        .section3 {
+          background: url(../../assets/img/section3.png) no-repeat;
+          background-size: 100% 100%;
+        }
+        .section4 {
+          background: url(../../assets/img/section4.png) no-repeat;
+          background-size: 100% 100%;
+        }
+        .section5 {
+          background: url(../../assets/img/section5.png) no-repeat;
+          background-size: 100% 100%;
+        }
+      }
+      .sectionClose {
+        position: fixed;
+        top: 20px;
+        right: 20px;
+        cursor: pointer;
+      }
+    }
+
     // 移动端
 
     @media screen and (max-width: 1000px) {
@@ -247,6 +336,7 @@
         #gui-fullscreen,
         #gui-fullscreen-exit,
         .A2_share_box,
+        .sectionIndex,
         .A2_view_box {
           width: 35px;
           height: 35px;
@@ -264,6 +354,10 @@
         }
       }
 
+      .sectionIndex {
+        display: none;
+      }
+
       .darkGlass {
         background-color: rgba(0, 0, 0, 0.5);
       }

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

@@ -3,7 +3,7 @@
   top: 50%;
   right: 0;
   transform: translate(0, -50%);
-  width: 250px;
+  width: 350px;
   height: 100%;
   z-index: 30001;
   display: flex;
@@ -16,11 +16,10 @@
       align-items: center;
       justify-content: flex-start;
       gap: 10px;
-      width: 250px;
+      width: 350px;
       height: 100%;
-      background: url('../../assets/img/hotlist_bg.png') center center;
-      background-size: cover;
-      color: rgba(43, 31, 23, 0.9);
+      background: #695c44;
+      color: #ffe3cc;
       font-size: 17px;
       font-weight: 500;
       overflow: auto;
@@ -33,7 +32,7 @@
         padding: 40px 0 10px 0;
         font-size: 24px;
         font-weight: 400;
-        color: rgba(43, 31, 23, 0.9);
+        color: #ffe3cc;
       }
       .A3item {
         display: flex;
@@ -50,9 +49,9 @@
       .A3close {
         position: fixed;
         bottom: 0;
-        width: 250px;
+        width: 350px;
         height: 40px;
-        background-color: rgba(157, 135, 106, 0.9);
+        background-color: #695c44;
         border-top: 1px solid rgba(43, 31, 23, 0.1);
         cursor: pointer;
         &:hover {
@@ -63,8 +62,8 @@
           top: 50%;
           left: 50%;
           transform: translate(-50%, -50%);
-          width: 24px;
-          height: 24px;
+          width: 34px;
+          height: 34px;
           opacity: 0.6;
         }
       }
@@ -84,8 +83,6 @@
       .A3main {
         width: 100%;
         height: 100%;
-        background: url('../../assets/img/hotlist_bg.png') no-repeat center center;
-        background-size: cover;
         padding-bottom: 36px;
         .A3title {
           padding: 20px 0 10px 0;
@@ -101,7 +98,6 @@
         .A3close {
           width: 100%;
           height: 40px;
-          background-color: rgba(157, 135, 106, 0.9);
           border-top: 1px solid rgba(43, 31, 23, 0.1);
           img {
             width: 16px;

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

@@ -1,72 +0,0 @@
-.A4base {
-  position: relative;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 99999;
-  width: 100%;
-  height: 100%;
-  transition: all 0.5s;
-  background: url('./image/bg.png') repeat center center;
-  // background-size: 100% 100%;
-  > div {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    img {
-      object-fit: contain;
-      width: 100%;
-      height: 100%;
-    }
-  }
-  :global {
-    .A4base-title3 {
-      transform: translate(-50%, -420px);
-      width: 1728px;
-      height: 50px;
-    }
-    .A4base-logo {
-      transform: translate(-865px, -350px);
-      width: 100px;
-      height: 150px;
-    }
-    .A4base-content {
-      width: 1150px;
-      height: 500px;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      transform: translate(-50%, -280px);
-      .A4base-title2 {
-        width: 68%;
-        height: 100%;
-      }
-      .A4base-title1 {
-        width: 100%;
-        height: 100%;
-      }
-      .A4base-other {
-        width: 78%;
-        height: 100%;
-      }
-    }
-
-    .A4base-pic1 {
-      transform: translate(650px, -70px);
-      width: 202px;
-      height: 316px;
-    }
-    .A4base-pic2 {
-      transform: translate(-50%, 50%);
-      width: 1920px;
-      height: 325px;
-    }
-    .A4base-button {
-      transform: translate(-50%, 345px);
-      width: 164px;
-      height: 41px;
-      cursor: pointer;
-    }
-  }
-}

Scene/src/pages/A4base/index.tsx

@@ -1,29 +0,0 @@
-import React from 'react'
-import styles from './index.module.scss'
-import { useHistory } from 'react-router-dom'
-function A4base({ show, setShow }: { show: boolean; setShow: (show: boolean) => void }) {
-  const history = useHistory()
-  return (
-    <div className={styles.A4base} style={{ display: show ? 'block' : 'none' }}>
-      <div className='A4base-content'>
-        <div className='A4base-title1'>
-          <img src={require('./image/title.png')} alt='' />
-        </div>
-      </div>
-      <div
-        className='A4base-button'
-        onClick={() => {
-          setShow(false)
-          history.push('/home?m=SG-56imSLC7Zli')
-          window.location.reload()
-        }}
-      >
-        <img src={require('./image/button.png')} alt='' />
-      </div>
-    </div>
-  )
-}
-
-const MemoA4base = React.memo(A4base)
-
-export default MemoA4base

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

@@ -1,33 +0,0 @@
-.A5Mobile {
-  position: relative;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 99999;
-  width: 100%;
-  height: 100%;
-  transition: all 0.5s;
-  background: url('./image/bg.png') no-repeat center center;
-  background-size: 100% 100%;
-  > div {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    img {
-      object-fit: contain;
-      width: 100%;
-      height: 100%;
-    }
-  }
-  :global {
-    .title {
-      transform: translate(-50%, -61%);
-      width: 200px;
-    }
-    .button {
-      cursor: pointer;
-      transform: translate(-50%, 229px);
-      width: 110px;
-    }
-  }
-}

Scene/src/pages/A5Mobile/index.tsx

@@ -1,27 +0,0 @@
-import React from 'react'
-import styles from './index.module.scss'
-import { useHistory } from 'react-router-dom'
-function A5Mobile({ show, setShow }: { show: boolean; setShow: (show: boolean) => void }) {
-  const history = useHistory()
-  return (
-    <div className={styles.A5Mobile} style={{ display: show ? 'block' : 'none' }}>
-      <div className='title'>
-        <img src={require('./image/title.png')} alt='' />
-      </div>
-      <div
-        className='button'
-        onClick={() => {
-          setShow(false)
-          history.push('/home?m=SG-56imSLC7Zli')
-          window.location.reload()
-        }}
-      >
-        <img src={require('./image/button.png')} alt='' />
-      </div>
-    </div>
-  )
-}
-
-const MemoA5Mobile = React.memo(A5Mobile)
-
-export default MemoA5Mobile