lanxin hace 3 semanas
padre
commit
bbd8c26078
Se han modificado 39 ficheros con 105 adiciones y 112 borrados
  1. BIN
      Hot/src/assets/images/pc/hot_bg.png
  2. BIN
      Hot/src/assets/images/pc/hot_bg_M.png
  3. 0 1
      Scene/package.json
  4. BIN
      Scene/public/images/Volume btn_off.png
  5. BIN
      Scene/public/images/Volume btn_on.png
  6. BIN
      Scene/public/images/auto-suspend.png
  7. BIN
      Scene/public/images/auto.png
  8. BIN
      Scene/public/images/dollhouse.png
  9. BIN
      Scene/public/images/dollhouse_active.png
  10. BIN
      Scene/public/images/floor.png
  11. BIN
      Scene/public/images/floor_active.png
  12. BIN
      Scene/public/images/full.png
  13. BIN
      Scene/public/images/fullx.png
  14. BIN
      Scene/public/images/hotlist.png
  15. BIN
      Scene/public/images/inside.png
  16. BIN
      Scene/public/images/inside_active.png
  17. BIN
      Scene/public/images/pause.png
  18. BIN
      Scene/public/images/play.png
  19. 1 1
      Scene/public/index.html
  20. 1 1
      Scene/public/js/Hot.js
  21. BIN
      Scene/src/assets/img/hot_bg.png
  22. BIN
      Scene/src/assets/img/hot_bg_M.png
  23. BIN
      Scene/src/assets/img/hotlist_bg.png
  24. BIN
      Scene/src/assets/img/hotlist_bg_M.png
  25. BIN
      Scene/src/assets/img/like.png
  26. BIN
      Scene/src/assets/img/likeAc.png
  27. BIN
      Scene/src/assets/img/section.png
  28. BIN
      Scene/src/assets/img/section1.png
  29. BIN
      Scene/src/assets/img/section2.png
  30. BIN
      Scene/src/assets/img/section3.png
  31. BIN
      Scene/src/assets/img/section4.png
  32. BIN
      Scene/src/assets/img/section5.png
  33. BIN
      Scene/src/assets/img/share.png
  34. BIN
      Scene/src/assets/img/toolBar_bg.png
  35. BIN
      Scene/src/assets/img/view.png
  36. 97 97
      Scene/src/pages/A2main/index.module.scss
  37. 4 3
      Scene/src/pages/A2main/index.tsx
  38. 1 1
      Scene/src/pages/A3hotList/index.module.scss
  39. 1 8
      Scene/yarn.lock

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


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


+ 0 - 1
Scene/package.json

@@ -4,7 +4,6 @@
   "private": true,
   "dependencies": {
     "@ant-design/cssinjs": "^1.5.6",
-    "@dage/krpano": "^2.2.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",

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/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


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

+ 1 - 1
Scene/public/js/Hot.js

@@ -55,7 +55,7 @@ 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/hubeiMuseum/hbxddyjz/hot')
+    return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'https://houseoss.4dkankan.com/project/jining/hot')
     // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8080')
     // return src
   }

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


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


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


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


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


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


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


BIN
Scene/src/assets/img/section1.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/toolBar_bg.png


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


+ 97 - 97
Scene/src/pages/A2main/index.module.scss

@@ -33,7 +33,7 @@
       background-size: 100% 100%;
       display: flex;
       align-items: center;
-      padding-bottom: 20px;
+      padding-bottom: 6px;
       justify-content: center;
 
       .logo {
@@ -244,103 +244,103 @@
         cursor: pointer;
       }
     }
-    .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 */
+    // .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: 250px;
-            padding: 38px;
-            font-size: 13px;
-            line-height: 21px;
-            text-indent: 2em;
-          }
-        }
-        .section1 {
-          background: url(../../assets/img/section1.png) no-repeat;
-          background-size: 100% 100%;
-          p {
-            color: #000000;
-          }
-        }
-        .section2 {
-          background: url(../../assets/img/section2.png) no-repeat;
-          background-size: 100% 100%;
-          p {
-            color: #fff;
-          }
-        }
-        .section3 {
-          background: url(../../assets/img/section3.png) no-repeat;
-          background-size: 100% 100%;
-          p {
-            color: #fff;
-          }
-        }
-        .section4 {
-          background: url(../../assets/img/section4.png) no-repeat;
-          background-size: 100% 100%;
-          p {
-            color: #000;
-          }
-        }
-        .section5 {
-          background: url(../../assets/img/section5.png) no-repeat;
-          background-size: 100% 100%;
-          p {
-            color: #000;
-          }
-        }
-      }
-      .sectionClose {
-        position: fixed;
-        top: 20px;
-        right: 20px;
-        cursor: pointer;
-      }
-    }
+    //     & > div {
+    //       flex: 0 0 auto;
+    //       width: 19%;
+    //       height: 91%;
+    //       background-size: contain;
+    //       cursor: pointer;
+    //       p {
+    //         margin-top: 250px;
+    //         padding: 38px;
+    //         font-size: 13px;
+    //         line-height: 21px;
+    //         text-indent: 2em;
+    //       }
+    //     }
+    //     .section1 {
+    //       background: url(../../assets/img/section1.png) no-repeat;
+    //       background-size: 100% 100%;
+    //       p {
+    //         color: #000000;
+    //       }
+    //     }
+    //     .section2 {
+    //       background: url(../../assets/img/section2.png) no-repeat;
+    //       background-size: 100% 100%;
+    //       p {
+    //         color: #fff;
+    //       }
+    //     }
+    //     .section3 {
+    //       background: url(../../assets/img/section3.png) no-repeat;
+    //       background-size: 100% 100%;
+    //       p {
+    //         color: #fff;
+    //       }
+    //     }
+    //     .section4 {
+    //       background: url(../../assets/img/section4.png) no-repeat;
+    //       background-size: 100% 100%;
+    //       p {
+    //         color: #000;
+    //       }
+    //     }
+    //     .section5 {
+    //       background: url(../../assets/img/section5.png) no-repeat;
+    //       background-size: 100% 100%;
+    //       p {
+    //         color: #000;
+    //       }
+    //     }
+    //   }
+    //   .sectionClose {
+    //     position: fixed;
+    //     top: 20px;
+    //     right: 20px;
+    //     cursor: pointer;
+    //   }
+    // }
 
     // 移动端
 

+ 4 - 3
Scene/src/pages/A2main/index.tsx

@@ -14,8 +14,9 @@ import http from '@/utils/http'
 const imgArrTemp = ['like.png', 'likeAc.png']
 const imgArr = imgArrTemp.map(item => require(`@/assets/img/${item}`))
 
+
 function A2main() {
-  const SCENE_CODE = 'SG-eIO0OyK0Iuk-03'
+  const SCENE_CODE = (window.location.hash).split('m=')[1]
   // 漫游的状态
   const { state3d } = useSelector((state: RootState) => state.three)
 
@@ -279,7 +280,7 @@ function A2main() {
         </div>
       </div>
 
-      <div
+      {/* <div
         className='sectionIndex'
         onClick={() => {
           setIsShowSection(true)
@@ -287,7 +288,7 @@ function A2main() {
         }}
       >
         <img className='sectionIndexImg' src={require('../../assets/img/section.png')} alt='' draggable='false' />
-      </div>
+      </div> */}
 
       <div
         className='section'

+ 1 - 1
Scene/src/pages/A3hotList/index.module.scss

@@ -51,7 +51,7 @@
       .A3close {
         position: fixed;
         bottom: 0;
-        width: 350px;
+        width: 400px;
         height: 50px;
         background-color: #77382f;
         border-top: 1px solid rgba(43, 31, 23, 0.1);

+ 1 - 8
Scene/yarn.lock

@@ -1315,13 +1315,6 @@
   resolved "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz#b6c75a56a1947cc916ea058772d666a2c8932f31"
   integrity sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==
 
-"@dage/krpano@^2.2.0":
-  version "2.2.0"
-  resolved "http://192.168.20.245:4873/@dage/krpano/-/krpano-2.2.0.tgz#33651a7d99e9072fdbc5277b9ca5f9dc63cd7042"
-  integrity sha512-wuxl59g5OAozx/OXpJVQeCGreho3LVPzwJSnmnyxXG0pAfhN4+4r9r9w3oxY5EjPjEhT5Fnc8tnj8bxdGS/WiA==
-  dependencies:
-    escape-html "^1.0.3"
-
 "@emotion/hash@^0.8.0":
   version "0.8.0"
   resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
@@ -4553,7 +4546,7 @@ escalade@^3.1.1:
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
-escape-html@^1.0.3, escape-html@~1.0.3:
+escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==