lanxin 1 nedēļu atpakaļ
vecāks
revīzija
d5521a17ff
65 mainītis faili ar 118 papildinājumiem un 247 dzēšanām
  1. BIN
      Hot/src/assets/images/pc/hot_bg.png
  2. BIN
      Hot/src/assets/images/pc/hot_bg_M.png
  3. BIN
      Hot/src/assets/images/pc/icon-left.png
  4. BIN
      Hot/src/assets/images/pc/icon-right.png
  5. BIN
      Hot/src/assets/images/pc/left.png
  6. BIN
      Hot/src/assets/images/pc/right.png
  7. 6 5
      Hot/src/views/Home.vue
  8. 1 1
      Scene/public/css/main.css
  9. 4 4
      Scene/public/css/oldVer/main0.css
  10. BIN
      Scene/public/images/Volume btn_off.png
  11. BIN
      Scene/public/images/Volume btn_on.png
  12. BIN
      Scene/public/images/auto-suspend.png
  13. BIN
      Scene/public/images/auto.png
  14. BIN
      Scene/public/images/close1.png
  15. BIN
      Scene/public/images/dollhouse.png
  16. BIN
      Scene/public/images/dollhouse_active.png
  17. BIN
      Scene/public/images/floor.png
  18. BIN
      Scene/public/images/floor_active.png
  19. BIN
      Scene/public/images/full.png
  20. BIN
      Scene/public/images/fullx.png
  21. BIN
      Scene/public/images/hotlist.png
  22. BIN
      Scene/public/images/inside.png
  23. BIN
      Scene/public/images/inside_active.png
  24. BIN
      Scene/public/images/pause.png
  25. BIN
      Scene/public/images/play.png
  26. BIN
      Scene/public/images/toolBar_bg.png
  27. 1 1
      Scene/public/index.html
  28. 2 2
      Scene/public/js/Hot.js
  29. 5 15
      Scene/public/showa/js/loadCAD.js
  30. BIN
      Scene/src/assets/img/close.png
  31. BIN
      Scene/src/assets/img/like.png
  32. BIN
      Scene/src/assets/img/likeAc.png
  33. BIN
      Scene/src/assets/img/nextP.png
  34. BIN
      Scene/src/assets/img/preP.png
  35. BIN
      Scene/src/assets/img/section.png
  36. BIN
      Scene/src/assets/img/section1.1.png
  37. BIN
      Scene/src/assets/img/section1.2.png
  38. BIN
      Scene/src/assets/img/section1.3.png
  39. BIN
      Scene/src/assets/img/section1.png
  40. BIN
      Scene/src/assets/img/section2.1.png
  41. BIN
      Scene/src/assets/img/section2.2.png
  42. BIN
      Scene/src/assets/img/section2.3.png
  43. BIN
      Scene/src/assets/img/section2.4.png
  44. BIN
      Scene/src/assets/img/section2.png
  45. BIN
      Scene/src/assets/img/section3.png
  46. BIN
      Scene/src/assets/img/section4.png
  47. BIN
      Scene/src/assets/img/section5.png
  48. BIN
      Scene/src/assets/img/share.png
  49. BIN
      Scene/src/assets/img/splitImg.png
  50. BIN
      Scene/src/assets/img/toolBar_bg.png
  51. BIN
      Scene/src/assets/img/view.png
  52. 2 7
      Scene/src/pages/A0base/index.tsx
  53. 45 28
      Scene/src/pages/A2main/index.module.scss
  54. 45 13
      Scene/src/pages/A2main/index.tsx
  55. 7 10
      Scene/src/pages/A3hotList/index.module.scss
  56. BIN
      Scene/src/pages/A4base/image/bg.png
  57. BIN
      Scene/src/pages/A4base/image/button.png
  58. BIN
      Scene/src/pages/A4base/image/title.png
  59. 0 72
      Scene/src/pages/A4base/index.module.scss
  60. 0 29
      Scene/src/pages/A4base/index.tsx
  61. BIN
      Scene/src/pages/A5Mobile/image/bg.png
  62. BIN
      Scene/src/pages/A5Mobile/image/button.png
  63. BIN
      Scene/src/pages/A5Mobile/image/title.png
  64. 0 33
      Scene/src/pages/A5Mobile/index.module.scss
  65. 0 27
      Scene/src/pages/A5Mobile/index.tsx

BIN
Hot/src/assets/images/pc/hot_bg.png


BIN
Hot/src/assets/images/pc/hot_bg_M.png


BIN
Hot/src/assets/images/pc/icon-left.png


BIN
Hot/src/assets/images/pc/icon-right.png


BIN
Hot/src/assets/images/pc/left.png


BIN
Hot/src/assets/images/pc/right.png


+ 6 - 5
Hot/src/views/Home.vue

@@ -302,11 +302,11 @@ export default {
     width: 100%;
     margin: 0 auto;
     height: 100%;
-    padding: 30px 50px 20px 20px;
+    padding: 30px 20px 20px 20px;
     display: flex;
     align-items: center;
     flex-direction: column;
-
+    gap: 20px;
     justify-content: center;
     .myTitle {
       font-size: 22px;
@@ -338,7 +338,7 @@ export default {
       border-radius: 6px;
       overflow: hidden;
       width: 700px;
-      height: calc(100% - 270px);
+      height: calc(100% - 240px);
       margin-top: 40px;
       .oneTabNum {
         z-index: 10;
@@ -394,8 +394,8 @@ export default {
         top: 50%;
         transform: translateY(-50%);
         left: 30px;
-        width: 80px;
-        height: 99px;
+        width: 40px;
+        height: 60px;
         background-image: url("../assets/images/pc/left.png");
         background-size: 100% 100%;
         z-index: 1;
@@ -416,6 +416,7 @@ export default {
     .txtBox {
       height: 0;
       flex: 1;
+      width: 100%;
       .flooTxt {
         margin: 0 auto;
         margin-top: 10px;

+ 1 - 1
Scene/public/css/main.css

@@ -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;

+ 4 - 4
Scene/public/css/oldVer/main0.css

@@ -78,8 +78,8 @@ iframe {
 }
 .popup-content {
   position: relative;
-  width: 70%;
-  height: 80%;
+  width: 60%;
+  height: 70%;
   overflow: hidden;
 }
 #id1 {
@@ -98,7 +98,7 @@ iframe {
   background-size: 100% 100%;
   position: absolute;
   top: 80px;
-  right: 200px;
+  right: 350px;
 }
 .specialTitle {
   bottom: 65%;
@@ -235,7 +235,7 @@ a {
     width: 30px;
     height: 30px;
     position: absolute;
-    top: 70px;
+    top: 90px;
     right: 25px;
   }
 

BIN
Scene/public/images/Volume btn_off.png


BIN
Scene/public/images/Volume btn_on.png


BIN
Scene/public/images/auto-suspend.png


BIN
Scene/public/images/auto.png


BIN
Scene/public/images/close1.png


BIN
Scene/public/images/dollhouse.png


BIN
Scene/public/images/dollhouse_active.png


BIN
Scene/public/images/floor.png


BIN
Scene/public/images/floor_active.png


BIN
Scene/public/images/full.png


BIN
Scene/public/images/fullx.png


BIN
Scene/public/images/hotlist.png


BIN
Scene/public/images/inside.png


BIN
Scene/public/images/inside_active.png


BIN
Scene/public/images/pause.png


BIN
Scene/public/images/play.png


BIN
Scene/public/images/toolBar_bg.png


+ 1 - 1
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" />

+ 2 - 2
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/hbjdfy/hot')
+    // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8080')
     // return src
   }
   var removeSrcPostMark = function (url) {

+ 5 - 15
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({

BIN
Scene/src/assets/img/close.png


BIN
Scene/src/assets/img/like.png


BIN
Scene/src/assets/img/likeAc.png


BIN
Scene/src/assets/img/nextP.png


BIN
Scene/src/assets/img/preP.png


BIN
Scene/src/assets/img/section.png


BIN
Scene/src/assets/img/section1.1.png


BIN
Scene/src/assets/img/section1.2.png


BIN
Scene/src/assets/img/section1.3.png


BIN
Scene/src/assets/img/section1.png


BIN
Scene/src/assets/img/section2.1.png


BIN
Scene/src/assets/img/section2.2.png


BIN
Scene/src/assets/img/section2.3.png


BIN
Scene/src/assets/img/section2.4.png


BIN
Scene/src/assets/img/section2.png


BIN
Scene/src/assets/img/section3.png


BIN
Scene/src/assets/img/section4.png


BIN
Scene/src/assets/img/section5.png


BIN
Scene/src/assets/img/share.png


BIN
Scene/src/assets/img/splitImg.png


BIN
Scene/src/assets/img/toolBar_bg.png


BIN
Scene/src/assets/img/view.png


+ 2 - 7
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 />
     </>
   )
 }

+ 45 - 28
Scene/src/pages/A2main/index.module.scss

@@ -18,14 +18,14 @@
       line-height: 30px;
       text-align: center;
       font-size: 14px;
-      color: #326f64;
+      color: #242764;
     }
 
     // 样式重置
     .pinBottom.left {
       width: 960px;
       margin-right: 350px;
-      height: 85px;
+      height: 95px;
       left: 50%;
       transform: translateX(-50%);
       background-size: contain;
@@ -56,6 +56,7 @@
 
     #gui-modes-map {
       margin-left: 30px;
+      background: #d5cfca;
       #play,
       #pause,
       #next,
@@ -67,6 +68,7 @@
         width: 45px;
         height: 45px;
         margin-left: 30px;
+
         background-color: transparent !important;
         position: relative;
 
@@ -87,6 +89,7 @@
       display: flex;
       justify-content: flex-end;
       align-items: center;
+      background: #d5cfca;
       gap: 30px;
       .likeBox,
       .A2_map_box,
@@ -153,7 +156,7 @@
         z-index: 100;
         left: -18px;
         bottom: 0;
-        text-shadow: 1px 1px 1px #fcda99;
+        // text-shadow: 1px 1px 1px #fcda99;
         opacity: 0;
         pointer-events: none;
       }
@@ -238,7 +241,7 @@
       bottom: 40px;
       right: 30px;
       .sectionIndexImg {
-        width: 125px;
+        width: 90px;
         height: 100%;
         object-fit: cover;
         cursor: pointer;
@@ -270,12 +273,12 @@
         padding: 0 20px;
         width: fit-content;
         overflow: auto;
-        height: 89%;
+        height: 85%;
         width: 100%;
         display: flex;
         flex-wrap: nowrap;
         scroll-behavior: smooth;
-        justify-content: center;
+        justify-content: flex-start;
         align-items: center;
         gap: 20px;
         ::-webkit-scrollbar {
@@ -286,53 +289,67 @@
 
         & > div {
           flex: 0 0 auto;
-          width: 19%;
-          height: 91%;
+          width: 16%;
+          height: 75%;
+          align-self: end;
           background-size: contain;
           cursor: pointer;
           p {
-            margin-top: 250px;
+            margin-top: 325px;
             padding: 38px;
             font-size: 13px;
             line-height: 21px;
             text-indent: 2em;
+            color: #d5cdc8;
+            letter-spacing: 1px;
           }
         }
         .section1 {
+          width: 17%;
+          height: 95%;
           background: url(../../assets/img/section1.png) no-repeat;
           background-size: 100% 100%;
-          p {
-            color: #000000;
+          & > p {
+            margin-top: 435px;
           }
         }
         .section2 {
-          background: url(../../assets/img/section2.png) no-repeat;
+          background: url(../../assets/img/section1.1.png) no-repeat;
           background-size: 100% 100%;
-          p {
-            color: #fff;
-          }
         }
         .section3 {
-          background: url(../../assets/img/section3.png) no-repeat;
+          background: url(../../assets/img/section1.2.png) no-repeat;
           background-size: 100% 100%;
-          p {
-            color: #fff;
-          }
         }
         .section4 {
-          background: url(../../assets/img/section4.png) no-repeat;
+          background: url(../../assets/img/section1.3.png) no-repeat;
           background-size: 100% 100%;
-          p {
-            color: #000;
-          }
         }
         .section5 {
-          background: url(../../assets/img/section5.png) no-repeat;
+          width: 17%;
+          height: 95%;
+          background: url(../../assets/img/section2.png) no-repeat;
           background-size: 100% 100%;
-          p {
-            color: #000;
+          & > p {
+            margin-top: 445px;
           }
         }
+        .section6 {
+          background: url(../../assets/img/section2.1.png) no-repeat;
+          background-size: 100% 100%;
+        }
+        .section7 {
+          background: url(../../assets/img/section2.2.png) no-repeat;
+          background-size: 100% 100%;
+        }
+        .section8 {
+          background: url(../../assets/img/section2.3.png) no-repeat;
+          background-size: 100% 100%;
+        }
+        .section9 {
+          background: url(../../assets/img/section2.4.png) no-repeat;
+          background-size: 100% 100%;
+        }
       }
       .sectionClose {
         position: fixed;
@@ -349,8 +366,8 @@
         height: 20px;
         top: 24px;
         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);
+        color: #242764;
+        // text-shadow: 0 0 5px rgba(253, 251, 178, 0.8), 0 0 10px rgba(253, 251, 178, 0.6);
       }
       #gui-modes-map {
         border-radius: 25px;

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 45 - 13
Scene/src/pages/A2main/index.tsx


+ 7 - 10
Scene/src/pages/A3hotList/index.module.scss

@@ -20,8 +20,8 @@
       height: 100%;
       // background: url('../../assets/img/hotlist_bg.png') center center;
       // background-size: cover;
-      background-color: #77382f;
-      color: #f8f1e4;
+      background-color: #d1ccc6;
+      color: #242764;
       font-size: 17px;
       font-weight: 500;
       overflow: auto;
@@ -34,7 +34,7 @@
         padding: 40px 0 10px 0;
         font-size: 24px;
         font-weight: 400;
-        color: #fdf6e9;
+        color: #2d2d45;
       }
       .A3item {
         display: flex;
@@ -45,7 +45,7 @@
         padding: 4px 3px;
         cursor: pointer;
         &:hover {
-          background-color: #a16f5d;
+          background-color: #807b98;
         }
       }
       .A3close {
@@ -53,7 +53,7 @@
         bottom: 0;
         width: 350px;
         height: 50px;
-        background-color: #77382f;
+        background-color: #d1ccc6;
         border-top: 1px solid rgba(43, 31, 23, 0.1);
         cursor: pointer;
         &:hover {
@@ -95,17 +95,14 @@
         .A3item {
           font-size: 13px;
           padding: 10px 3px;
-          &:touch {
-            background-color: rgba(163, 143, 116, 1);
-          }
         }
         .A3close {
           width: 100%;
           height: 40px;
           border-top: 1px solid rgba(43, 31, 23, 0.1);
           img {
-            width: 16px;
-            height: 16px;
+            width: 25px;
+            height: 25px;
           }
         }
       }

BIN
Scene/src/pages/A4base/image/bg.png


BIN
Scene/src/pages/A4base/image/button.png


BIN
Scene/src/pages/A4base/image/title.png


+ 0 - 72
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;
-    }
-  }
-}

+ 0 - 29
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

BIN
Scene/src/pages/A5Mobile/image/bg.png


BIN
Scene/src/pages/A5Mobile/image/button.png


BIN
Scene/src/pages/A5Mobile/image/title.png


+ 0 - 33
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;
-    }
-  }
-}

+ 0 - 27
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