před 4 dny · 66ff900f21
--- a/pano/src/assets/styles/base.css
+++ b/pano/src/assets/styles/base.css
@@ -224,3 +224,14 @@ textarea {
 
				     pointer-events: auto;
			
 
				   }
			
 
				 }
			
 
				+@keyframes a0hotspot-breathe {
			
 
				+  0% {
			
 
				+    scale: 1;
			
 
				+  }
			
 
				+  50% {
			
 
				+    scale: 0.98;
			
 
				+  }
			
 
				+  100% {
			
 
				+    scale: 1;
			
 
				+  }
			
 
				+}
			
--- a/pano/src/assets/styles/base.less
+++ b/pano/src/assets/styles/base.less
@@ -344,3 +344,16 @@ textarea {
 
				     pointer-events: auto;
			
 
				   }
			
 
				 }
			
 
				+
			
 
				+
			
 
				+@keyframes a0hotspot-breathe {
			
 
				+  0%{
			
 
				+   scale: 1;
			
 
				+  }
			
 
				+  50% {
			
 
				+    scale: 0.98;
			
 
				+  }
			
 
				+  100% {
			
 
				+    scale: 1;
			
 
				+  }
			
 
				+}
			
--- a/pano/src/components/Pano/index.module.scss
+++ b/pano/src/components/Pano/index.module.scss
@@ -5,17 +5,20 @@
 
				   position: fixed;

			
 
				   top: 0;

			
 
				   left: 0;

			
 
				-

			
 
				+ 

			
 
				   :global {

			
 
				     .krpano {

			
 
				       height: 100vh;

			
 
				     }

			
 
				 

			
 
				+   

			
 
				+

			
 
				     .A0hotspot {

			
 
				       width: 430px;

			
 
				       height: 295px;

			
 
				-      color: rgba(112, 73, 7, 1);

			
 
				-      background-image: url('../../assets/img/hotpot_bg.png');

			
 
				+     

			
 
				+      color: rgba(255, 243, 197, 1);

			
 
				+      background-image: url('../../assets/img/hotpot_bg_ac.png');

			
 
				       background-repeat: no-repeat;

			
 
				       background-position: center center;

			
 
				       background-size: contain;

			
@@ -25,6 +28,7 @@
 
				       align-items: flex-start;

			
 
				       justify-content: center;

			
 
				       pointer-events: auto !important;

			
 
				+      animation: a0hotspot-breathe 2.2s linear infinite;

			
 
				 

			
 
				       .text {

			
 
				         width: 100%;

			
@@ -35,8 +39,8 @@
 
				       }

			
 
				 

			
 
				       &:has(.text:hover) {

			
 
				-        background-image: url('../../assets/img/hotpot_bg_ac.png');

			
 
				-        color: rgba(255, 243, 197, 1);

			
 
				+        background-image: url('../../assets/img/hotpot_bg.png');

			
 
				+        color: rgba(112, 73, 7, 1);

			
 
				       }

			
 
				 

			
 
				     }

			
@@ -178,8 +182,8 @@
 
				     @media screen and (max-width: 500px) {

			
 
				       // 取消hover

			
 
				       .A0hotspot:has(.text:hover) {

			
 
				-        background-image: url('../../assets/img/hotpot_bg.png');

			
 
				-        color: rgba(112, 73, 7, 1);

			
 
				+        background-image: url('../../assets/img/hotpot_bg_ac.png');

			
 
				+        color: rgba(255, 243, 197, 1);

			
 
				       }

			
 
				     }

			
 
				   }

			
--- a/pano/src/components/Pano/index.tsx
+++ b/pano/src/components/Pano/index.tsx
@@ -61,7 +61,7 @@ const Panoramic = ({ openHot }: { openHot: (id: string) => void }) => {
 
				           <>
			
 
				             <View
			
 
				               hlookat={0}
			
 
				-              vlookat={40}
			
 
				+              vlookat={20}
			
 
				               fovType='MFOV'
			
 
				               fov={120}
			
 
				               maxPixelZoom={2}
			
@@ -75,8 +75,8 @@ const Panoramic = ({ openHot }: { openHot: (id: string) => void }) => {
 
				             <HotSpot
			
 
				               name='dccgftTitle'
			
 
				               type='text'
			
 
				-              atv={25.83}
			
 
				-              ath={-1.08}
			
 
				+              atv={-5.17}
			
 
				+              ath={1.22}
			
 
				               scale={0.5}
			
 
				               edge='top'
			
 
				               bg={false}
			
--- a/project/public/index.html
+++ b/project/public/index.html
@@ -10,6 +10,7 @@
 
				     <meta name="description" content="Web site created using create-react-app" />
			
 
				     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
			
 
				     <link rel="shortcut icon" href="./favicon.png" />
			
 
				+    <link rel="preload" href="./syst.otf" as="font" type="font/otf" crossorigin />
			
 
				     <script src="./three/data.js"></script>
			
 
				     <title>革命领袖视察黑龙江纪念馆</title>
			
 
				   </head>
			
@@ -17,6 +18,7 @@
 
				   <body>
			
 
				     <noscript>You need to enable JavaScript to run this app.</noscript>
			
 
				     <div id="root" style="width: 100%; height: 100vh"></div>
			
 
				+    <span class="font-preload-syst" aria-hidden="true">syst preload</span>
			
 
				   </body>
			
 
				   <style>
			
 
				     @font-face {
			
@@ -24,6 +26,12 @@
 
				       src: url('./syst.otf') format('opentype');
			
 
				       font-display: swap;
			
 
				     }
			
 
				+    .font-preload-syst {
			
 
				+      position: absolute;
			
 
				+      opacity: 0;
			
 
				+      pointer-events: none;
			
 
				+      font-family: 'syst';
			
 
				+    }
			
 
				     * {
			
 
				       .nameEn {
			
 
				         font-family: 'syst';
			
--- a/project/public/three/data.js
+++ b/project/public/three/data.js
--- a/project/src/assets/styles/base.css
+++ b/project/src/assets/styles/base.css
@@ -6,6 +6,9 @@
 
				   -webkit-tap-highlight-color: transparent;
			
 
				   font-family: heiti;
			
 
				 }
			
 
				+* .nameEn {
			
 
				+  font-family: 'syst';
			
 
				+}
			
 
				 video {
			
 
				   object-fit: fill;
			
 
				   width: 100%;
			
--- a/project/src/assets/styles/base.less
+++ b/project/src/assets/styles/base.less
@@ -5,6 +5,10 @@
 
				   word-wrap: break-word;
			
 
				   -webkit-tap-highlight-color: transparent;
			
 
				   font-family: heiti;
			
 
				+
			
 
				+  .nameEn {
			
 
				+    font-family: 'syst';
			
 
				+  }
			
 
				 }
			
 
				 
			
 
				 video {
			
@@ -825,4 +829,4 @@ textarea {
 
				     opacity: 1;
			
 
				     pointer-events: auto;
			
 
				   }
			
 
				-}
			
 
				+}
			
--- a/project/src/components/MenuSider/index.module.scss
+++ b/project/src/components/MenuSider/index.module.scss
@@ -35,15 +35,23 @@
 
				     background-repeat: no-repeat;
			
 
				     padding-left: 10%;
			
 
				     font-size: 1.2vw;
			
 
				-    font-weight: 500;
			
 
				+
			
 
				     color: rgb(112, 73, 7);
			
 
				     cursor: pointer;
			
 
				+    .siderItemTitle {
			
 
				+      width: 100%;
			
 
				+      height: 100%;
			
 
				+      display: flex;
			
 
				+      align-items: center;
			
 
				+      padding-bottom: 1%;
			
 
				+    }
			
 
				   }
			
 
				   .siderItemAc {
			
 
				     background-image: url('../../assets/img/tab_btn_ac.png');
			
 
				     background-size: contain;
			
 
				     background-repeat: no-repeat;
			
 
				     color: rgba(249, 211, 109, 1);
			
 
				+    font-weight: 500;
			
 
				     pointer-events: none;
			
 
				   }
			
 
				 }
			
--- a/project/src/pages/A0base/index.tsx
+++ b/project/src/pages/A0base/index.tsx
@@ -110,7 +110,7 @@ function A0base() {
 
				           const displayProgress =
			
 
				             performance.now() - startTime < MIN_STAY_MS ? Math.min(realProgress, 60) : realProgress
			
 
				 
			
 
				-          setProgress(displayProgress)
			
 
				+          setProgress(displayProgress * 2)
			
 
				 
			
 
				           // 下载到50%即可尝试跳转（但后台继续完整下载）
			
 
				           if (realProgress >= EARLY_NAVIGATE_PROGRESS) {
			
--- a/project/src/pages/A3architecture/LoadingVideo/index.tsx
+++ b/project/src/pages/A3architecture/LoadingVideo/index.tsx
@@ -3,7 +3,8 @@ import styles from './index.module.scss'
 
				 import MenuSider from '@/components/MenuSider'

			
 
				 import { baseOssUrl } from '@/utils/http'

			
 
				 

			
 
				-const LOADING_MS = 20_000

			
 
				+const FIRST_LOADING_MS = 20_000

			
 
				+const NEXT_LOADING_MS = 2_000

			
 
				 const EXIT_MS = 600

			
 
				 

			
 
				 type LoadingVideoProps = {

			
@@ -27,6 +28,13 @@ function LoadingVideo({ videoSrc }: LoadingVideoProps) {
 
				     setIsLoadingExiting(false)

			
 
				     setLoadingProgress(0)

			
 
				 

			
 
				+    const loadingSeenKey = `loading-video-seen:${videoUrl}`

			
 
				+    const hasSeenLoading = localStorage.getItem(loadingSeenKey) === '1'

			
 
				+    const loadingMs = hasSeenLoading ? NEXT_LOADING_MS : FIRST_LOADING_MS

			
 
				+    if (!hasSeenLoading) {

			
 
				+      localStorage.setItem(loadingSeenKey, '1')

			
 
				+    }

			
 
				+

			
 
				     let finished = false

			
 
				     let timer: ReturnType<typeof setTimeout> | undefined

			
 
				     const t0 = performance.now()

			
@@ -50,7 +58,7 @@ function LoadingVideo({ videoSrc }: LoadingVideoProps) {
 
				       if (finished) return

			
 
				       const v = videoRef.current

			
 
				       const elapsed = performance.now() - t0

			
 
				-      const timePct = Math.min(95, Math.floor((elapsed / LOADING_MS) * 95))

			
 
				+      const timePct = Math.min(95, Math.floor((elapsed / loadingMs) * 95))

			
 
				       let bufPct = 0

			
 
				       if (v && v.duration && isFinite(v.duration) && v.buffered.length > 0) {

			
 
				         bufPct = Math.floor((v.buffered.end(v.buffered.length - 1) / v.duration) * 100)

			
@@ -66,14 +74,14 @@ function LoadingVideo({ videoSrc }: LoadingVideoProps) {
 
				     const raf = requestAnimationFrame(() => {

			
 
				       const v = videoRef.current

			
 
				       if (!v) {

			
 
				-        timer = setTimeout(reveal, LOADING_MS)

			
 
				+        timer = setTimeout(reveal, loadingMs)

			
 
				         return

			
 
				       }

			
 
				       v.addEventListener('progress', tick)

			
 
				       v.addEventListener('loadedmetadata', tick)

			
 
				       v.addEventListener('canplay', tick)

			
 
				 

			
 
				-      timer = setTimeout(reveal, LOADING_MS)

			
 
				+      timer = setTimeout(reveal, loadingMs)

			
 
				 

			
 
				       removeListeners = () => {

			
 
				         v.removeEventListener('progress', tick)

			
--- a/project/src/pages/A6life/Intro/index.module.scss
+++ b/project/src/pages/A6life/Intro/index.module.scss
@@ -8,20 +8,20 @@
 
				   .imgBox {
			
 
				     width: 55%;
			
 
				     height: 100%;
			
 
				-    .imgBoxInner{
			
 
				+    .imgBoxInner {
			
 
				       width: 100%;
			
 
				       height: 100%;
			
 
				       background-image: url('../../../assets/img/A6_life_intro.png');
			
 
				       background-size: 100% 100%;
			
 
				       background-repeat: no-repeat;
			
 
				       background-position: center center;
			
 
				-      & >img {
			
 
				-        padding: 2.5%;
			
 
				+      & > img {
			
 
				+        padding: 1%;
			
 
				         width: 100%;
			
 
				         height: 100%;
			
 
				         object-fit: fill;
			
 
				       }
			
 
				-    } 
			
 
				+    }
			
 
				   }
			
 
				   .textBox {
			
 
				     width: 45%;
			
@@ -31,7 +31,7 @@
 
				     align-items: center;
			
 
				     justify-content: center;
			
 
				     gap: 2vh;
			
 
				-    .textTop{
			
 
				+    .textTop {
			
 
				       width: 70%;
			
 
				       height: 10vh;
			
 
				       background-image: url('../../../assets/img/A6_life_intro_title.png');
			
@@ -43,9 +43,8 @@
 
				       line-height: 9.5vh;
			
 
				       font-weight: bold;
			
 
				       color: rgba(249, 211, 109, 1);
			
 
				-
			
 
				     }
			
 
				-    .textBottom{
			
 
				+    .textBottom {
			
 
				       width: 90%;
			
 
				       height: fit-content;
			
 
				       max-height: calc(100% - 12vh);
			
--- a/project/src/pages/A6life/Intro/index.tsx
+++ b/project/src/pages/A6life/Intro/index.tsx
@@ -13,7 +13,7 @@ function Intro({
 
				     <div className={styles.Intro}>
			
 
				       <div className={styles.imgBox}>
			
 
				         <div className={styles.imgBoxInner}>
			
 
				-          <img src={baseOssUrl + myDataTemp.lifeList[activeIndex].imgSrc} alt='' />
			
 
				+          <img src={baseOssUrl + myDataTemp.lifeList[activeIndex].imgSrcBig} alt='' />
			
 
				         </div>
			
 
				       </div>
			
 
				       <div className={styles.textBox}>
			
--- a/project/src/pages/A6lifeM/index.tsx
+++ b/project/src/pages/A6lifeM/index.tsx
@@ -12,7 +12,7 @@ function A6lifeM() {
 
				       <div className={styles.title}>{myDataTemp.lifeList[activeIndex].name}</div>
			
 
				       {activeIndex !== myDataTemp.lifeList.length - 1 ? (
			
 
				         <div className={styles.imgBox}>
			
 
				-          <img src={baseOssUrl + myDataTemp.lifeList[activeIndex].imgSrc} alt='' />
			
 
				+          <img src={baseOssUrl + myDataTemp.lifeList[activeIndex].imgSrcM} alt='' />
			
 
				         </div>
			
 
				       ) : (
			
 
				         <div className={styles.videoBox}>
			
--- a/project/src/types/declaration.d.ts
+++ b/project/src/types/declaration.d.ts
@@ -39,7 +39,15 @@ type MyDataType = {
 
				     imgSrcLight: string
			
 
				     videoSrc: string
			
 
				   }[]
			
 
				-  lifeList: { name: string; time: string; imgSrc: string; videoSrc?: string; desc: string }[]
			
 
				+  lifeList: {
			
 
				+    name: string
			
 
				+    time: string
			
 
				+    imgSrc: string
			
 
				+    imgSrcBig: string
			
 
				+    imgSrcM: string
			
 
				+    videoSrc?: string
			
 
				+    desc: string
			
 
				+  }[]
			
 
				   animationList: { name: string; imgSrc: string; videoSrc: string }[]
			
 
				 }
			
 
				 
			
--- a/静态文件/myData/img/life1.jpg
+++ b/静态文件/myData/img/life1.jpg
--- a/静态文件/myData/img/life1_M.png
+++ b/静态文件/myData/img/life1_M.png
--- a/静态文件/myData/img/life1_big.png
+++ b/静态文件/myData/img/life1_big.png
--- a/静态文件/myData/img/life2.jpg
+++ b/静态文件/myData/img/life2.jpg
--- a/静态文件/myData/img/life2_M.png
+++ b/静态文件/myData/img/life2_M.png
--- a/静态文件/myData/img/life2_big.png
+++ b/静态文件/myData/img/life2_big.png
--- a/静态文件/myData/img/life3.jpg
+++ b/静态文件/myData/img/life3.jpg
--- a/静态文件/myData/img/life3_M.png
+++ b/静态文件/myData/img/life3_M.png
--- a/静态文件/myData/img/life3_big.png
+++ b/静态文件/myData/img/life3_big.png
--- a/静态文件/myData/img/life4.jpg
+++ b/静态文件/myData/img/life4.jpg
--- a/静态文件/myData/img/life4_M.png
+++ b/静态文件/myData/img/life4_M.png
--- a/静态文件/myData/img/life4_big.png
+++ b/静态文件/myData/img/life4_big.png
--- a/静态文件/myData/img/life5.jpg
+++ b/静态文件/myData/img/life5.jpg
--- a/静态文件/myData/img/life5_M.png
+++ b/静态文件/myData/img/life5_M.png
--- a/静态文件/myData/img/life5_big.png
+++ b/静态文件/myData/img/life5_big.png
--- a/静态文件/myData/img/life6.jpg
+++ b/静态文件/myData/img/life6.jpg
--- a/静态文件/myData/img/life6_M.png
+++ b/静态文件/myData/img/life6_M.png
--- a/静态文件/myData/img/life6_big.png
+++ b/静态文件/myData/img/life6_big.png
--- a/静态文件/myData/img/life7.jpg
+++ b/静态文件/myData/img/life7.jpg
--- a/静态文件/myData/img/life7_M.png
+++ b/静态文件/myData/img/life7_M.png
--- a/静态文件/myData/img/life7_big.png
+++ b/静态文件/myData/img/life7_big.png
--- a/静态文件/myData/img/life8.jpg
+++ b/静态文件/myData/img/life8.jpg
--- a/静态文件/myData/img/life8_M.png
+++ b/静态文件/myData/img/life8_M.png
--- a/静态文件/myData/img/life8_big.png
+++ b/静态文件/myData/img/life8_big.png
--- a/静态文件/myData/media/record.mp4
+++ b/静态文件/myData/media/record.mp4