lanxin 2 هفته پیش
والد
کامیت
3489b91121

+ 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/hbxddyjz/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({

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

+ 1 - 1
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 = 'SG-eIO0OyK0Iuk-03'
   // 漫游的状态
   const { state3d } = useSelector((state: RootState) => state.three)
 

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