update

Hot/src/views/Home.vue

@@ -306,7 +306,7 @@ export default {
     width: 100%;
     margin: 0 auto;
     height: 100%;
-    padding: 30px 50px 20px 20px;
+    padding: 40px 0 20px 0;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -340,7 +340,7 @@ export default {
       border-radius: 6px;
       overflow: hidden;
       width: 700px;
-      height: calc(100% - 270px);
+      height: 45%;
       .oneTabNum {
         z-index: 10;
         position: absolute;
@@ -518,15 +518,16 @@ export default {
     .main {
       width: 100%;
       height: 100%;
-      padding: 0;
       position: absolute;
+      flex-direction: column;
+      gap: 6%;
       .myTitle {
         font-size: 16px;
         margin: 8px 0;
       }
       .mainCon {
         border-radius: 0;
-        height: calc(100% - 195px);
+        height: calc(100% - 330px);
         .contenBox {
           .videoBox {
             padding: 0 30px;
@@ -562,20 +563,35 @@ export default {
           background-image: url("../assets/images/pc/icon-right.png");
         }
       }
-      .flooTxt {
-        margin-top: -5px;
+      .txtBox {
         width: 100%;
-        padding: 10px 15px 0px 15px;
-        max-height: 250px;
+        height: 0;
+        flex: 1;
+        .fixedTx {
+          margin-bottom: 10px;
+        }
+        .logo {
+          margin-bottom: 0;
+          & > img {
+            width: 35px;
+          }
+        }
+        .flooTxt {
+          margin-top: 0;
+          width: 100%;
+          padding: 10px 30px 0px 30px;
+          max-height: 170px;
 
-        .flooTxtBox {
-          padding: 0;
-          .myTxt {
-            font-size: 14px;
-            line-height: 22px;
+          .flooTxtBox {
+            padding: 0;
+            .myTxt {
+              font-size: 14px;
+              line-height: 22px;
+            }
           }
         }
       }
+
       .flooTxtOne {
         height: 100%;
       }

Scene/package.json

@@ -12,6 +12,7 @@
     "@types/node": "^16.18.3",
     "@types/react": "^18.0.24",
     "@types/react-dom": "^18.0.8",
+    "@types/react-slick": "^0.23.13",
     "antd": "^5.8.3",
     "antd-mobile": "^5.30.0",
     "axios": "^1.1.3",
@@ -21,6 +22,7 @@
     "react-redux": "^8.0.4",
     "react-router-dom": "5.3",
     "react-scripts": "5.0.1",
+    "react-slick": "^0.31.0",
     "react-sortablejs": "^6.1.4",
     "redux": "^4.2.0",
     "redux-devtools-extension": "^2.13.9",
@@ -62,4 +64,4 @@
     "react-app-rewired": "^2.2.1"
   },
   "homepage": "."
-}
+}

Scene/public/css/main.css

@@ -4761,7 +4761,7 @@ a.tag-link {
   .pinBottom.left .ui-icon.wide,
   .ui-icon {
     font-size: 22px;
-    text-shadow: 0 0 5px rgba(0, 0, 0, 0.9);
+    /* text-shadow: 0 0 5px rgba(0, 0, 0, 0.9); */
   }
 }
 
@@ -4769,7 +4769,7 @@ a.tag-link {
   .pinBottom.left .ui-icon.wide,
   .ui-icon {
     font-size: 22px;
-    text-shadow: 0 0 5px rgba(0, 0, 0, 0.9);
+    /* text-shadow: 0 0 5px rgba(0, 0, 0, 0.9); */
   }
   .pinBottom.right {
     right: 0;

Scene/public/css/oldVer/main0.css

@@ -235,7 +235,7 @@ a {
     width: 30px;
     height: 30px;
     position: absolute;
-    top: 70px;
+    top: 90px;
     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/jcty/hot')
+    // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8080')
     // return src
   }
   var removeSrcPostMark = function (url) {

Scene/public/js/main_2020_show.js

@@ -7802,6 +7802,11 @@ window.Modernizr = (function (n, e, t) {
                   }),
                   t.goToHighlight([i.data('index'), 0]) //改
               }),
+              $('.sectionCont').on('click', function (e) {
+                const imgActIndex = $(this).data('index')
+                console.log('imgActIndex')
+                t.goToHighlight([imgActIndex, 0])
+              }),
               $('.previous')
                 .find('a')
                 .on('click', function (e) {

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/assets/styles/base.css

@@ -159,6 +159,16 @@ body,
     transform: scale(1.5);
   }
 }
+
+@keyframes arrowFlow {
+  0%, 80% {
+    opacity: 0;
+  }
+  20% {
+    opacity: 1;
+  }
+}
+
 @media screen and (max-width: 1000px) {
   html .cad {
     width: 120px;

Scene/src/pages/A0base/index.tsx

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

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

@@ -236,7 +236,7 @@
     .sectionIndex {
       position: fixed;
       bottom: 40px;
-      right:30px;
+      right: 30px;
       .sectionIndexImg {
         width: 125px;
         height: 100%;
@@ -309,7 +309,6 @@
           background: url(../../assets/img/section2.png) no-repeat;
           background-size: 100% 100%;
           p {
-    
             color: #fff;
           }
         }
@@ -317,7 +316,6 @@
           background: url(../../assets/img/section3.png) no-repeat;
           background-size: 100% 100%;
           p {
-          
             color: #fff;
           }
         }
@@ -325,7 +323,6 @@
           background: url(../../assets/img/section4.png) no-repeat;
           background-size: 100% 100%;
           p {
-           
             color: #000;
           }
         }
@@ -342,11 +339,15 @@
 
     @media screen and (max-width: 1000px) {
       .hoveImg {
-        height: 20px;
-        top: 24px;
+        height: 13px;
+        width: 46px;
+        line-height: 16px;
+        top: 0;
+        background-color: #fff;
+        border-radius: 5px;
+        margin-top: 34px;
         font-size: 10px;
-        color: #fff;
-        text-shadow: 0 0 5px rgba(253, 251, 178, 0.8), 0 0 10px rgba(253, 251, 178, 0.6);
+        font-weight: lighter;
       }
       #gui-modes-map {
         border-radius: 25px;

Scene/src/pages/A2main/index.tsx

@@ -15,7 +15,7 @@ const imgArrTemp = ['like.png', 'likeAc.png']
 const imgArr = imgArrTemp.map(item => require(`@/assets/img/${item}`))
 
 function A2main() {
-  const SCENE_CODE = 'mm-1579'
+  const SCENE_CODE = 'mm-1581'
   // 漫游的状态
   const { state3d } = useSelector((state: RootState) => state.three)
 

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

@@ -85,8 +85,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;
@@ -102,11 +100,12 @@
         .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;
-            height: 16px;
+            opacity: 1;
+            width: 25px;
+            height: 25px;
           }
         }
       }

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

Scene/yarn.lock

@@ -2378,6 +2378,13 @@
     "@types/history" "^4.7.11"
     "@types/react" "*"
 
+"@types/react-slick@^0.23.13":
+  version "0.23.13"
+  resolved "https://registry.npmmirror.com/@types/react-slick/-/react-slick-0.23.13.tgz#037434e73a58063047b121e08565f7185d811f36"
+  integrity sha512-bNZfDhe/L8t5OQzIyhrRhBr/61pfBcWaYJoq6UDqFtv5LMwfg4NsVDD2J8N01JqdAdxLjOt66OZEp6PX+dGs/A==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react@*", "@types/react@^18.0.24":
   version "18.2.30"
   resolved "https://registry.npmjs.org/@types/react/-/react-18.2.30.tgz#b84f786864fc46f18545364a54d5e1316308e59b"
@@ -8755,6 +8762,16 @@ react-scripts@5.0.1:
   optionalDependencies:
     fsevents "^2.3.2"
 
+react-slick@^0.31.0:
+  version "0.31.0"
+  resolved "https://registry.npmmirror.com/react-slick/-/react-slick-0.31.0.tgz#6b9c51b1a285acd6a5b7da70528c3a5429e86986"
+  integrity sha512-zo6VLT8wuSBJffg/TFPbzrw2dEnfZ/cUKmYsKByh3AgatRv29m2LoFbq5vRMa3R3A4wp4d8gwbJKO2fWZFaI3g==
+  dependencies:
+    classnames "^2.2.5"
+    json2mq "^0.2.0"
+    lodash.debounce "^4.0.8"
+    resize-observer-polyfill "^1.5.0"
+
 react-sortablejs@^6.1.4:
   version "6.1.4"
   resolved "https://registry.npmjs.org/react-sortablejs/-/react-sortablejs-6.1.4.tgz#420ebfab602bbd935035dec24a04c8b3b836dbbf"
@@ -8943,7 +8960,7 @@ requires-port@^1.0.0:
   resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
-resize-observer-polyfill@^1.5.1:
+resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
   version "1.5.1"
   resolved "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
   integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==