shaogen1995 8 mesiacov pred
rodič
commit
fa630bd353
53 zmenil súbory, kde vykonal 947 pridanie a 117 odobranie
  1. 877 44
      Code/public/myData/hot.js
  2. 19 18
      Code/public/myData/myData.js
  3. 2 0
      Code/src/components/Zhot/type.d.ts
  4. 5 4
      Code/src/pages/A2visit/PanoVideo/index.tsx
  5. 5 4
      Code/src/pages/A2visit2/A22Pano/index.tsx
  6. 18 46
      Code/src/pages/A4dance/index.tsx
  7. 21 1
      Code/src/pages/A5chef/index.tsx
  8. BIN
      资源/staticData/Zhot/houChu/ww_eyachi.png
  9. BIN
      资源/staticData/Zhot/houChu/ww_geng.png
  10. BIN
      资源/staticData/Zhot/houChu/ww_taoding2.png
  11. BIN
      资源/staticData/Zhot/houChu/ww_taofu.png
  12. BIN
      资源/staticData/Zhot/houChu/ww_taozao1.png
  13. BIN
      资源/staticData/Zhot/houChu/ww_taozao2.png
  14. BIN
      资源/staticData/Zhot/houChu/ww_taozhen.png
  15. BIN
      资源/staticData/Zhot/houChu/ww_tongfu.png
  16. BIN
      资源/staticData/Zhot/houChu/ww_xuanwenpen.png
  17. BIN
      资源/staticData/Zhot/houChu/ww_yangjuan.png
  18. BIN
      资源/staticData/Zhot/houChu/ww_yuandifu.png
  19. BIN
      资源/staticData/Zhot/houChu/ww_zhenfu.png
  20. BIN
      资源/staticData/Zhot/houChu/ww_zheng1.png
  21. BIN
      资源/staticData/Zhot/houChu/ww_zheng2.png
  22. BIN
      资源/staticData/Zhot/houChu/ww_zhi1.png
  23. BIN
      资源/staticData/Zhot/houChu/ww_zhi2.png
  24. BIN
      资源/staticData/Zhot/houChu/ww_zhidoufu1.png
  25. BIN
      资源/staticData/Zhot/houChu/ww_zhidoufu2.png
  26. BIN
      资源/staticData/Zhot/houChu/ww_zhidoufu3.png
  27. BIN
      资源/staticData/Zhot/houChu/ww_zhidoufu4.png
  28. BIN
      资源/staticData/Zhot/houChu/ww_zhidoufu5.png
  29. BIN
      资源/staticData/Zhot/houChu/ww_zhikaolu1.png
  30. BIN
      资源/staticData/Zhot/houChu/ww_zhikaolu2.png
  31. BIN
      资源/staticData/Zhot/yueWu/ww_daoliyong1.png
  32. BIN
      资源/staticData/Zhot/yueWu/ww_daoliyong2.png
  33. BIN
      资源/staticData/Zhot/yueWu/ww_huaxiangshi5.png
  34. BIN
      资源/staticData/Zhot/yueWu/ww_huaxiangshi6.png
  35. BIN
      资源/staticData/Zhot/yueWu/ww_huaxiangshi7.png
  36. BIN
      资源/staticData/Zhot/yueWu/ww_huaxiangshi8.png
  37. BIN
      资源/staticData/Zhot/yueWu/ww_huaxiangzhuan1.png
  38. BIN
      资源/staticData/Zhot/yueWu/ww_huaxiangzhuan2.png
  39. BIN
      资源/staticData/Zhot/yueWu/ww_huaxiangzhuan3.png
  40. BIN
      资源/staticData/Zhot/yueWu/ww_huaxiangzhuan4.png
  41. BIN
      资源/staticData/Zhot/yueWu/ww_letaoqun.png
  42. BIN
      资源/staticData/Zhot/yueWu/ww_letaoyongqun.png
  43. BIN
      资源/staticData/Zhot/yueWu/ww_lewuhuaxiangshi1.png
  44. BIN
      资源/staticData/Zhot/yueWu/ww_lewuhuaxiangshi2.png
  45. BIN
      资源/staticData/Zhot/yueWu/ww_lewuhuaxiangshi3.png
  46. BIN
      资源/staticData/Zhot/yueWu/ww_shuochangyong1.png
  47. BIN
      资源/staticData/Zhot/yueWu/ww_taozajiyong.png
  48. BIN
      资源/staticData/Zhot/yueWu/ww_wurenpei.png
  49. BIN
      资源/staticData/Zhot/yueWu/ww_zajiyong1.png
  50. BIN
      资源/staticData/Zhot/yueWu/ww_zajiyong2.png
  51. BIN
      资源/staticData/Zhot/yueWu/ww_zajiyong3.png
  52. BIN
      资源/staticData/visit/end.mp4
  53. BIN
      资源/staticData/visit2/贵宾.mp4

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 877 - 44
Code/public/myData/hot.js


+ 19 - 18
Code/public/myData/myData.js

@@ -2106,8 +2106,8 @@ const myDataTemp = {
         `,
         // 热点定位百分比
         loc: {
-          top: '70%',
-          left: '76%'
+          top: '64%',
+          left: '89%'
         }
       },
       {
@@ -2125,8 +2125,8 @@ const myDataTemp = {
         `,
         // 热点定位百分比
         loc: {
-          top: '74%',
-          left: '64.5%'
+          top: '75%',
+          left: '56.4%'
         }
       },
       {
@@ -2144,8 +2144,8 @@ const myDataTemp = {
         `,
         // 热点定位百分比
         loc: {
-          top: '71%',
-          left: '57%'
+          top: '68%',
+          left: '67%'
         }
       },
       {
@@ -2163,13 +2163,13 @@ const myDataTemp = {
         `,
         // 热点定位百分比
         loc: {
-          top: '67%',
-          left: '49%'
+          top: '65%',
+          left: '56%'
         }
       },
       {
         // 热点名字
-        name: '烧烤',
+        name: '',
         // 热点图片路径+名字
         hoverSrc: 'chef/hot6.png',
         // 点击之后的播放动画路径+名字
@@ -2178,17 +2178,17 @@ const myDataTemp = {
         showImg: 'chef/show6.png',
         // 里面展示的文本
         txt: `
-        <p>汉代的烧烤常用竹签将食物穿起,置于炭火上烤制,既是常见的家宴菜肴,也适合狩猎或野外活动时的饮食需求。</p>
+        <p>炙,《说文解字:》“炙,炙肉也。从肉在火上。”“炙”是用物将肉串好,再置于火上烤的一种烹饪方法。从文献和出土汉代画像石的图像来看,汉代烤肉已非常普遍。</p>
         `,
         // 热点定位百分比
         loc: {
           top: '70%',
-          left: '18%'
+          left: '17%'
         }
       },
       {
         // 热点名字
-        name: '装',
+        name: '装',
         // 热点图片路径+名字
         hoverSrc: 'chef/hot7.png',
         // 点击之后的播放动画路径+名字
@@ -2201,8 +2201,8 @@ const myDataTemp = {
         `,
         // 热点定位百分比
         loc: {
-          top: '70%',
-          left: '25%'
+          top: '62%',
+          left: '24%'
         }
       },
       {
@@ -2216,12 +2216,12 @@ const myDataTemp = {
         showImg: 'chef/show8.png',
         // 里面展示的文本
         txt: `
-        <p>汉代多用陶制蒸器或木制蒸笼,将食材放置其中,利用土灶的热力将食物蒸熟。</p>
+        <p>将食物放在甑中置于釜上蒸熟,蒸时釜中放足水。</p>
         `,
         // 热点定位百分比
         loc: {
           top: '67%',
-          left: '38%'
+          left: '2.75%'
         }
       },
       {
@@ -2235,16 +2235,17 @@ const myDataTemp = {
         showImg: 'chef/show9.png',
         // 里面展示的文本
         txt: `
-        <p>将食材放入陶制或铜制的锅中加水煮熟,根据食材和需求,可制成汤羹或主食。</p>
+        <p>煮,是最常用的方法,汉代是将食物放在铁釜中熬煮至熟,然后取出食用,称作“釜炙”。</p>
         `,
         // 热点定位百分比
         loc: {
           top: '70%',
-          left: '32%'
+          left: '30%'
         }
       }
     ]
   },
+
   // 田间耕作(静态资源目录位置:staticData/plow)
   plow: {
     // 最后的过场动画路径+名字

+ 2 - 0
Code/src/components/Zhot/type.d.ts

@@ -46,6 +46,8 @@ export type HotInfoType = {
   yanYing1: HotRowType[]
   yanYing2: HotRowType[]
   yanYing3: HotRowType[]
+  yueWu: HotRowType[]
+  houCu: HotRowType[]
   周礼九拜: {
     name: string
     tubiao: '普通' | '文物'

+ 5 - 4
Code/src/pages/A2visit/PanoVideo/index.tsx

@@ -7,9 +7,10 @@ import { KrpanoMiddleware, KrpanoMiddlewareMethods } from '@/components/KrpanoMi
 import ZHot0 from '@/components/ZHot0'
 import Zhot from '@/components/Zhot'
 
-// window.draggbleHotspotEvent = (ath: number, atv: number) => {
-//   console.log(`ath: ${ath}, atv: ${atv}`)
-// }
+// 待完善位置
+window.draggbleHotspotEvent = (ath: number, atv: number) => {
+  console.log(`ath: ${ath}, atv: ${atv}`)
+}
 
 type Propr = {
   lodingOk: () => void
@@ -85,7 +86,7 @@ function PanoVideo({ lodingOk }: Propr) {
                 onOut={() => setActiveIdx(-1)}
                 onClick={() => setAcName(item.name)}
                 // @ts-ignore
-                // onDown='draggable_hotspot()'
+                onDown='draggable_hotspot()'
               >
                 <HotIcon
                   isModel={item.tubiao === '文物' ? true : false}

+ 5 - 4
Code/src/pages/A2visit2/A22Pano/index.tsx

@@ -5,9 +5,10 @@ import { HotSpot, Krpano, Scene, View } from '@dage/krpano'
 import HotIcon from '@/components/HotIcon'
 import { KrpanoMiddleware } from '@/components/KrpanoMiddleware'
 
-// window.draggbleHotspotEvent = (ath: number, atv: number) => {
-//   console.log(`ath: ${ath}, atv: ${atv}`)
-// }
+// 待完善位置
+window.draggbleHotspotEvent = (ath: number, atv: number) => {
+  console.log(`ath: ${ath}, atv: ${atv}`)
+}
 
 type Props = {
   setAcName: (val: string) => void
@@ -58,7 +59,7 @@ function A22Pano({ setAcName }: Props) {
                 onOut={() => setActiveIdx(-1)}
                 onClick={() => setAcName(item.name)}
                 // @ts-ignore
-                // onDown='draggable_hotspot()'
+                onDown='draggable_hotspot()'
               >
                 <HotIcon
                   isModel={item.tubiao === '文物' ? true : false}

+ 18 - 46
Code/src/pages/A4dance/index.tsx

@@ -1,16 +1,15 @@
 import React, { useCallback, useEffect, useState } from 'react'
 import styles from './index.module.scss'
-import { baseURL, myData } from '@/utils/http'
+import { baseURL, hotInfo, myData } from '@/utils/http'
 import classNames from 'classnames'
-import Hot2 from '../A2visit/PanoVideo/Hot2'
 import EndVideo from '@/components/EndVideo'
 import BaseImg from '@/components/BaseImg'
 import FloorBtn from '@/components/FloorBtn'
 import NextPage from '@/components/NextPage'
 import useLoding from '@/components/ownUse/useLoding'
-import history from '@/utils/history'
 import BtnRight from '@/components/BtnRight'
 import VideoModel from '@/components/VideoModel'
+import Zhot from '@/components/Zhot'
 
 function A4dance() {
   const [baseSta, setBaseSta] = useState(window.location.href.includes('r=ren') ? true : false)
@@ -43,14 +42,8 @@ function A4dance() {
     }
   }, [floorAc])
 
-  const [hotInd, setHotInd] = useState(-1)
-
-  const hotShowFu = useCallback((index: number) => {
-    if (index === 0) {
-      // 云气图 直接跳页面
-      history.push('/yun')
-    } else setHotInd(index)
-  }, [])
+  //新 热点
+  const [acName, setAcName] = useState('')
 
   // 先加载背景图 序列帧等 在加载视频
   const { imgNow, imgNumFu } = useLoding(2)
@@ -80,31 +73,17 @@ function A4dance() {
             baseSta ? 'pvBoxShow' : 'pvBoxHide'
           )}
         >
-          {/* 热点图标 云气图为第一个*/}
-          {myData.dance.hot.map(
-            (item, index) =>
-              item.name === '汉代乐舞百戏' ? (
-                <div
-                  onClick={() => hotShowFu(1)}
-                  key={index}
-                  className='A4leftBtn'
-                  style={{ backgroundImage: `url(${baseURL}chef/chuBtn.png)` }}
-                >
-                  汉代乐舞百戏
-                </div>
-              ) : null
-            // <HotIcon
-            //   style={{
-            //     top: item.locPage.top,
-            //     left: item.locPage.left
-            //   }}
-            //   key={index}
-            //   index={index}
-            //   clickSon={val => hotShowFu(val)}
-            //   hoverSrc={item.hoverSrc}
-            //   isZhan={true}
-            // />
-          )}
+          {/* 汉代乐舞百戏*/}
+          {hotInfo.yueWu.map((item, index) => (
+            <div
+              onClick={() => setAcName(item.name)}
+              key={index}
+              className='A4leftBtn'
+              style={{ backgroundImage: `url(${baseURL}chef/chuBtn.png)` }}
+            >
+              汉代乐舞百戏
+            </div>
+          ))}
 
           {/* 底部 */}
           <div className='pvfloor'>
@@ -198,16 +177,6 @@ function A4dance() {
         />
       ) : null} */}
 
-      {/* 点击其他热点 */}
-      {hotInd > 0 ? (
-        <div className={'A4othHot'}>
-          <Hot2
-            data={myData.dance.hot[hotInd].data}
-            closeFu={() => setHotInd(-1)}
-            name={myData.dance.hot[hotInd].name}
-          />
-        </div>
-      ) : null}
       {/* 结尾动画 */}
       {imgNow ? (
         <EndVideo
@@ -217,6 +186,9 @@ function A4dance() {
           path='/chef'
         />
       ) : null}
+
+      {/* 热点 */}
+      {acName ? <Zhot name={acName} closeFu={() => setAcName('')} /> : null}
     </div>
   )
 }

+ 21 - 1
Code/src/pages/A5chef/index.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useState } from 'react'
 import styles from './index.module.scss'
 import classNames from 'classnames'
-import { baseURL, myData } from '@/utils/http'
+import { baseURL, hotInfo, myData } from '@/utils/http'
 import EndVideo from '@/components/EndVideo'
 import BaseImg from '@/components/BaseImg'
 import HotIcon from '@/components/HotIcon'
@@ -9,6 +9,7 @@ import NextPage from '@/components/NextPage'
 import FloorBtn from '@/components/FloorBtn'
 import useLoding from '@/components/ownUse/useLoding'
 import BtnRight from '@/components/BtnRight'
+import Zhot from '@/components/Zhot'
 
 function A5chef() {
   // 点击继续
@@ -48,6 +49,9 @@ function A5chef() {
   // 先加载背景图 序列帧等 在加载视频
   const { imgNow, imgNumFu } = useLoding(2)
 
+  //热点
+  const [acName, setAcName] = useState('')
+
   return (
     <div className={styles.A5chef}>
       {/* 整体盒子 */}
@@ -81,6 +85,20 @@ function A5chef() {
               />
             ))}
 
+            {/* ---------最新热点-------------- */}
+            {hotInfo.houCu.map((item, index) => (
+              <HotIcon
+                isModel={item.tubiao === '文物' ? true : false}
+                key={index}
+                index={index}
+                style={{ top: item.locPage.top, left: item.locPage.left }}
+                hoverSrc={item.hoverSrc}
+                zIndex={item.zIndex}
+                clickSon={() => setAcName(item.name)}
+                isXiao={0.67}
+              />
+            ))}
+
             {/* 后厨群像 */}
             <div
               style={{
@@ -153,6 +171,8 @@ function A5chef() {
           noBtn={true}
         />
       ) : null}
+
+      {acName ? <Zhot name={acName} closeFu={() => setAcName('')} /> : null}
     </div>
   )
 }

BIN
资源/staticData/Zhot/houChu/ww_eyachi.png


BIN
资源/staticData/Zhot/houChu/ww_geng.png


BIN
资源/staticData/Zhot/houChu/ww_taoding2.png


BIN
资源/staticData/Zhot/houChu/ww_taofu.png


BIN
资源/staticData/Zhot/houChu/ww_taozao1.png


BIN
资源/staticData/Zhot/houChu/ww_taozao2.png


BIN
资源/staticData/Zhot/houChu/ww_taozhen.png


BIN
资源/staticData/Zhot/houChu/ww_tongfu.png


BIN
资源/staticData/Zhot/houChu/ww_xuanwenpen.png


BIN
资源/staticData/Zhot/houChu/ww_yangjuan.png


BIN
资源/staticData/Zhot/houChu/ww_yuandifu.png


BIN
资源/staticData/Zhot/houChu/ww_zhenfu.png


BIN
资源/staticData/Zhot/houChu/ww_zheng1.png


BIN
资源/staticData/Zhot/houChu/ww_zheng2.png


BIN
资源/staticData/Zhot/houChu/ww_zhi1.png


BIN
资源/staticData/Zhot/houChu/ww_zhi2.png


BIN
资源/staticData/Zhot/houChu/ww_zhidoufu1.png


BIN
资源/staticData/Zhot/houChu/ww_zhidoufu2.png


BIN
资源/staticData/Zhot/houChu/ww_zhidoufu3.png


BIN
资源/staticData/Zhot/houChu/ww_zhidoufu4.png


BIN
资源/staticData/Zhot/houChu/ww_zhidoufu5.png


BIN
资源/staticData/Zhot/houChu/ww_zhikaolu1.png


BIN
资源/staticData/Zhot/houChu/ww_zhikaolu2.png


BIN
资源/staticData/Zhot/yueWu/ww_daoliyong1.png


BIN
资源/staticData/Zhot/yueWu/ww_daoliyong2.png


BIN
资源/staticData/Zhot/yueWu/ww_huaxiangshi5.png


BIN
资源/staticData/Zhot/yueWu/ww_huaxiangshi6.png


BIN
资源/staticData/Zhot/yueWu/ww_huaxiangshi7.png


BIN
资源/staticData/Zhot/yueWu/ww_huaxiangshi8.png


BIN
资源/staticData/Zhot/yueWu/ww_huaxiangzhuan1.png


BIN
资源/staticData/Zhot/yueWu/ww_huaxiangzhuan2.png


BIN
资源/staticData/Zhot/yueWu/ww_huaxiangzhuan3.png


BIN
资源/staticData/Zhot/yueWu/ww_huaxiangzhuan4.png


BIN
资源/staticData/Zhot/yueWu/ww_letaoqun.png


BIN
资源/staticData/Zhot/yueWu/ww_letaoyongqun.png


BIN
资源/staticData/Zhot/yueWu/ww_lewuhuaxiangshi1.png


BIN
资源/staticData/Zhot/yueWu/ww_lewuhuaxiangshi2.png


BIN
资源/staticData/Zhot/yueWu/ww_lewuhuaxiangshi3.png


BIN
资源/staticData/Zhot/yueWu/ww_shuochangyong1.png


BIN
资源/staticData/Zhot/yueWu/ww_taozajiyong.png


BIN
资源/staticData/Zhot/yueWu/ww_wurenpei.png


BIN
资源/staticData/Zhot/yueWu/ww_zajiyong1.png


BIN
资源/staticData/Zhot/yueWu/ww_zajiyong2.png


BIN
资源/staticData/Zhot/yueWu/ww_zajiyong3.png


BIN
资源/staticData/visit/end.mp4


BIN
资源/staticData/visit2/贵宾.mp4