upp

Code/public/myData/myData.js

@@ -570,8 +570,8 @@ const danceHotArr = [
     videoSrc: 'dance/8.mp4',
     // 热点定位百分比(当前页面)
     locPage: {
-      top: '39%',
-      left: '60%'
+      top: '37%',
+      left: '59%'
     },
     // 热点定位百分比(更多页面)
     loc: {

Code/src/assets/styles/base.css

@@ -101,7 +101,7 @@ textarea {
   transform: scale(1.1);
 }
 .yunShan {
-  animation: yunShan 2s infinite linear;
+  animation: yunShan 1.5s infinite linear;
   color: #f1e39e;
 }
 @keyframes yunShan {
@@ -167,6 +167,20 @@ textarea {
     transform: rotate(-360deg);
   }
 }
+#baseHuXi {
+  animation: baseHuXi 2s infinite linear;
+}
+@keyframes baseHuXi {
+  0% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.2;
+  }
+  100% {
+    opacity: 1;
+  }
+}
 #bgImgBox {
   position: absolute;
   top: 0;

Code/src/assets/styles/base.less

@@ -126,7 +126,7 @@ textarea {
 
 // 云气图闪动
 .yunShan {
-  animation: yunShan 2s infinite linear;
+  animation: yunShan 1.5s infinite linear;
   color: #f1e39e;
 }
 @keyframes yunShan {
@@ -191,7 +191,7 @@ textarea {
   }
 }
 
-// base页面的圈圈转动
+// base页面的圈圈转动、、按钮呼吸灯
 #xuanQuan {
   animation: xuanQuan 2s infinite linear;
 }
@@ -205,6 +205,23 @@ textarea {
   }
 }
 
+#baseHuXi {
+  animation: baseHuXi 2s infinite linear;
+}
+@keyframes baseHuXi {
+  0% {
+    opacity: 1;
+  }
+
+  50% {
+    opacity: 0.2;
+  }
+
+  100% {
+    opacity: 1;
+  }
+}
+
 #bgImgBox {
   position: absolute;
   top: 0;

Code/src/components/HotIcon/index.tsx

@@ -15,6 +15,7 @@ type Props = {
   isZhan?: boolean //是否全部展开
   // 全景视频和全景图的宽度
   panoWidth?: string
+  isXiao?: number
 }
 
 function HotIcon({
@@ -26,7 +27,8 @@ function HotIcon({
   hoverFu,
   isZhan,
   zIndex,
-  panoWidth
+  panoWidth,
+  isXiao
 }: Props) {
   const onMouseEnter = useCallback(() => {
     if (hoverFu) {
@@ -46,7 +48,8 @@ function HotIcon({
         top: style ? style.top : 0,
         left: style ? style.left : 0,
         zIndex: zIndex || 1,
-        width: panoWidth ? panoWidth : 'auto'
+        width: panoWidth ? panoWidth : 'auto',
+        transform: isXiao ? `scale(${isXiao}) translateX(-26%)` : ''
       }}
       className={classNames(
         styles.HotIcon,

Code/src/components/VideoModel/index.tsx

@@ -19,6 +19,12 @@ function VideoModel({ isShow, src, closeFu }: Props) {
           videoRef.current.play()
         }
       }, 100)
+    } else {
+      setTimeout(() => {
+        if (videoRef.current) {
+          videoRef.current.pause()
+        }
+      }, 100)
     }
   }, [isShow])
 

Code/src/pages/A1_1base/index.module.scss

@@ -39,6 +39,8 @@
           & > div {
             width: 100%;
             text-align: center;
+            position: relative;
+            right: 3px;
           }
           &:hover {
             & > div {

Code/src/pages/A1_1base/index.tsx

@@ -33,7 +33,7 @@ function A11base() {
         <div className='A11btn'>
           <div onClick={btnStartFu}>
             <img id='xuanQuan' onLoad={imgNumFu} src={`${baseURL}base/quan.png`} alt='' />
-            <div>点击开始</div>
+            <div id='baseHuXi'>点击开始</div>
           </div>
         </div>
       </div>

Code/src/pages/A2visit/PanoVideo/Hot1/index.module.scss

@@ -109,14 +109,12 @@
       }
 
       // 返回按钮
-      .h1Mback {
-        position: absolute;
+      #BtnRight {
         z-index: 10;
         top: 0;
         right: -40px;
         width: 36px;
-        height: auto;
-        cursor: pointer;
+        height: 36px;
       }
 
       // 底部

Code/src/pages/A2visit/PanoVideo/Hot1/index.tsx

@@ -4,6 +4,7 @@ import { VisitHotDataType } from '@/types'
 import classNames from 'classnames'
 import LazyImg from '@/components/LazyImg'
 import { baseURL } from '@/utils/http'
+import BtnRight from '@/components/BtnRight'
 
 type Props = {
   closeFu: () => void
@@ -93,12 +94,7 @@ function Hot1({ closeFu, data }: Props) {
           </div>
 
           {/* 返回按钮 */}
-          <img
-            className='h1Mback hoverD'
-            onClick={closeFu}
-            src={`${baseURL}visit/back.png`}
-            alt=''
-          />
+          <BtnRight imgName='back' clickSon={() => closeFu()} title='返回' />
         </div>
 
         {/* 底部 */}

Code/src/pages/A2visit/PanoVideo/Hot2/index.module.scss

@@ -136,13 +136,13 @@
       }
 
       // 返回按钮
-      .h2Back {
-        cursor: pointer;
-        text-align: center;
-        & > img {
-          width: 36px;
-          height: auto;
-        }
+      #BtnRight {
+        position: relative;
+        width: 36px;
+        height: 36px;
+        left: 50%;
+        transform: translateX(-50%);
+        bottom: 0px;
       }
     }
     .h2Right {
@@ -152,10 +152,33 @@
 
     // 屏幕>=1200
     @media screen and (min-width: 1200px) {
-      .h2Main .h2FlooBox .h2Floo {
-        max-width: 100%;
-        .h2FlooRow {
-          font-size: 12px;
+      .h2Main {
+        width: 40%;
+        .h2Titele {
+          font-size: 22px;
+        }
+        .h2TuWen {
+          .h2txt {
+            h3 {
+              font-size: 12px;
+            }
+            p {
+              font-size: 10px;
+              line-height: 20px;
+              margin-bottom: 5px;
+            }
+          }
+        }
+        .h2FlooBox {
+          height: 30px;
+          .h2Floo {
+            max-width: 100%;
+            min-width: 100px;
+            .h2FlooRow {
+              line-height: 28px;
+              font-size: 10px;
+            }
+          }
         }
       }
     }

Code/src/pages/A2visit/PanoVideo/Hot2/index.tsx

@@ -4,6 +4,7 @@ import { VisitHotDataType } from '@/types'
 import classNames from 'classnames'
 import LazyImg from '@/components/LazyImg'
 import { baseURL } from '@/utils/http'
+import BtnRight from '@/components/BtnRight'
 
 type Props = {
   closeFu: () => void
@@ -75,9 +76,7 @@ function Hot2({ closeFu, data, name }: Props) {
         )}
 
         {/* 返回按钮 */}
-        <div className='h2Back hoverD'>
-          <img onClick={closeFu} src={`${baseURL}visit/back.png`} alt='' />
-        </div>
+        <BtnRight imgName='back' clickSon={() => closeFu()} title='返回' />
       </div>
       <div className='h2Right' onClick={closeFu}></div>
     </div>

Code/src/pages/A4dance/index.module.scss

@@ -26,7 +26,7 @@
         position: absolute;
         z-index: 10;
         bottom: 25px;
-        left: 38px;
+        left: 56px;
         width: 100px;
         height: 36px;
         display: flex;

Code/src/pages/A5chef/index.module.scss

@@ -53,16 +53,6 @@
           pointer-events: none;
           transition: opacity 1s;
           background-size: 100% 100%;
-          .A5hotBoxBack {
-            position: absolute;
-            z-index: 10;
-            right: 25px;
-            bottom: 25px;
-            cursor: pointer;
-            width: 36px;
-            height: 36px;
-            background-size: 100% 100%;
-          }
         }
         .A5chuShow {
           opacity: 1;
@@ -89,6 +79,7 @@
 
       // 热点里面的图文信息
       .A5vTxt {
+        transition: opacity 0.3s;
         position: absolute;
         left: 0;
         top: 0;
@@ -112,18 +103,6 @@
           }
         }
       }
-
-      // 热点里面的返回按钮
-      .A5vBack {
-        position: absolute;
-        z-index: 10;
-        right: 25px;
-        bottom: 25px;
-        cursor: pointer;
-        width: 36px;
-        height: 36px;
-        background-size: 100% 100%;
-      }
     }
     .A5videoAc {
       opacity: 1;

Code/src/pages/A5chef/index.tsx

@@ -8,6 +8,7 @@ import HotIcon from '@/components/HotIcon'
 import NextPage from '@/components/NextPage'
 import FloorBtn from '@/components/FloorBtn'
 import useLoding from '@/components/ownUse/useLoding'
+import BtnRight from '@/components/BtnRight'
 
 function A5chef() {
   // 点击继续
@@ -107,12 +108,7 @@ function A5chef() {
               className={classNames('A5chu', chuShow ? 'A5chuShow' : '')}
             >
               {/* 返回按钮 */}
-              <div
-                style={{ backgroundImage: `url(${baseURL}chef/back23.png)` }}
-                className='A5hotBoxBack hoverD'
-                title='返回'
-                onClick={() => setChuShow(false)}
-              ></div>
+              <BtnRight imgName='back' clickSon={() => setChuShow(false)} title='返回' />
             </div>
             <div
               onClick={() => setChuShow(true)}
@@ -154,23 +150,30 @@ function A5chef() {
               ))}
 
               {/* 热点左侧图文信息 */}
-              <div className='A5vTxt' style={{ backgroundImage: `url(${baseURL}chef/hotBg.png)` }}>
+              <div
+                className='A5vTxt'
+                style={{
+                  opacity: videoPlay === '2' ? 1 : 0,
+                  backgroundImage: `url(${baseURL}chef/hotBg.png)`
+                }}
+              >
                 <img src={baseURL + item.showImg} alt='' />
                 <div dangerouslySetInnerHTML={{ __html: item.txt }}></div>
               </div>
 
               {/* 返回按钮 */}
-              <div
-                style={{ backgroundImage: `url(${baseURL}chef/back22.png)` }}
-                className='A5vBack hoverD'
-                title='返回'
-                onClick={() => {
-                  setVideoPlay('3')
-                  setTimeout(() => {
-                    if (videoRef3.current) videoRef3.current.play()
-                  }, 100)
-                }}
-              ></div>
+              {videoPlay === '2' ? (
+                <BtnRight
+                  imgName='back'
+                  clickSon={() => {
+                    setVideoPlay('3')
+                    setTimeout(() => {
+                      if (videoRef3.current) videoRef3.current.play()
+                    }, 100)
+                  }}
+                  title='返回'
+                />
+              ) : null}
             </div>
           ))
         : null}

Code/src/pages/A6plow/index.tsx

@@ -146,7 +146,7 @@ function A6plow() {
           </div>
 
           {/* 跳到下一章 */}
-          <NextPage clickSon={() => setLastVideo(true)} txt='结束耕作' />
+          <NextPage clickSon={() => setLastVideo(true)} txt='结束宴饮' />
           {/* 右下角按钮 */}
           <FloorBtn />
         </div>

Code/src/pages/A7end/index.tsx

@@ -17,13 +17,13 @@ function A7end() {
 
       {/* 中间文字 */}
       <div className='A7txt'>
-        <div onClick={() => history.push('/unend')}>陶庄园</div>
         <div onClick={() => setIsShow(true)}>重新开始</div>
         <div onClick={() => history.push('/more')}>内容导航</div>
+        <div onClick={() => history.push('/unend')}>陶庄园</div>
       </div>
 
       {/* 底部文字 */}
-      <div className='A7floor' dangerouslySetInnerHTML={{ __html: myData.end.txt }}></div>
+      <div hidden className='A7floor' dangerouslySetInnerHTML={{ __html: myData.end.txt }}></div>
 
       {/* 毛玻璃 */}
       <div className={classNames('A7model', isShow ? 'A7modelShow' : '')}>

Code/src/pages/B1more/S1manor/index.tsx

@@ -55,7 +55,6 @@ function S1manor({ hidden }: Props) {
             // 这个模块特有的参数
             hoverFu={val => setAcInd(val)}
             isHoverAc={adInd === index}
-            isZhan={true}
           />
         ))}
       </div>

Code/src/pages/B1more/S2mien/index.tsx

@@ -89,7 +89,7 @@ function S2mien({ hidden }: Props) {
           ))}
         </div>
         {/* 人和物的选择 */}
-        <div className='S2btn'>
+        <div className='S2btn' hidden>
           {leftFloorArr.map(v => (
             <div
               key={v}
@@ -120,6 +120,8 @@ function S2mien({ hidden }: Props) {
             hoverFu={val => setHotInd(val)}
             isHoverAc={hotInd === index}
             // isZhan={true}
+            isXiao={0.6}
+            // isXiao={isPc ? 0.6 : 0}
           />
         ))}
       </div>

Code/src/pages/B3yun/index.tsx

@@ -51,7 +51,7 @@ function B3yun() {
         ac2FlagRef.current = true
         setImgChange('')
         setAc2('')
-      }, 4000)
+      }, 3000)
     },
     [hotArr]
   )

Code/src/pages/C1unity/index.tsx

@@ -6,6 +6,7 @@ import { VisitHotDataType } from '@/types'
 import Hot1 from '../A2visit/PanoVideo/Hot1'
 import Hot2 from '../A2visit/PanoVideo/Hot2'
 import history from '@/utils/history'
+import BtnRight from '@/components/BtnRight'
 
 const obj = {
   1: {
@@ -67,6 +68,9 @@ function C1unity() {
     <div className={styles.C1unity}>
       {url ? <iframe frameBorder='none' title='漫游' src={url}></iframe> : null}
 
+      {/* 返回按钮 */}
+      <BtnRight imgName='back' clickSon={() => history.go(-1)} title='返回' />
+
       {ind === -1 ? null : ind === 0 && urlId === '1' ? (
         <Hot1 data={data} closeFu={() => setInd(-1)} />
       ) : (

Code/src/pages/C2unityEnd/index.module.scss

@@ -4,15 +4,5 @@
       width: 100%;
       height: 100%;
     }
-    .unityBack {
-      position: absolute;
-      z-index: 10;
-      right: 25px;
-      bottom: 25px;
-      cursor: pointer;
-      width: 36px;
-      height: 36px;
-      background-size: 100% 100%;
-    }
   }
 }

Code/src/pages/C2unityEnd/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
 import styles from './index.module.scss'
-import { baseURL, isPc, otherUrl } from '@/utils/http'
+import { isPc, otherUrl } from '@/utils/http'
 import history from '@/utils/history'
+import BtnRight from '@/components/BtnRight'
 
 const url = isPc
   ? 'unity/HeNanMuseum-pc/ManorScene/index.html'
@@ -12,12 +13,7 @@ function C2unityEnd() {
     <div className={styles.C2unityEnd}>
       <iframe title='陶庄园' src={otherUrl + url} frameBorder='0'></iframe>
       {/* 返回按钮 */}
-      <div
-        style={{ backgroundImage: `url(${baseURL}chef/back23.png)` }}
-        className='unityBack hoverD'
-        title='返回'
-        onClick={() => history.go(-1)}
-      ></div>
+      <BtnRight imgName='back' clickSon={() => history.go(-1)} title='返回' />
     </div>
   )
 }