up

public/Chenzhebei-ShanxiMuseum/StreamingAssets/Settings.json

@@ -11,7 +11,7 @@
       "cameraY": 0,
       "model": {
         "rotation": {
-          "x": 0,
+          "x": 5,
           "y": -180,
           "z": 0
         }
@@ -25,7 +25,7 @@
       "cameraY": 0,
       "model": {
         "rotation": {
-          "x": 0,
+          "x": 5,
           "y": -180,
           "z": 0
         }
@@ -39,7 +39,7 @@
       "cameraY": 0,
       "model": {
         "rotation": {
-          "x": 0,
+          "x": 5,
           "y": -180,
           "z": 0
         }
@@ -53,7 +53,7 @@
       "cameraY": 0,
       "model": {
         "rotation": {
-          "x": 0,
+          "x": 5,
           "y": -180,
           "z": 0
         }
@@ -67,7 +67,7 @@
       "cameraY": 0.6,
       "model": {
         "rotation": {
-          "x": 0,
+          "x": -5,
           "y": 0,
           "z": 0
         }
@@ -82,7 +82,7 @@
       "cameraY": 0,
       "model": {
         "rotation": {
-          "x": 0,
+          "x": 5,
           "y": -180,
           "z": 0
         }
@@ -100,7 +100,7 @@
         "offset": -2,
         "position": {
           "y": 0.8,
-          "z": -50
+          "z": -20
         }
       },
       "model": {
@@ -121,7 +121,7 @@
         "offset": -2,
         "position": {
           "y": 0,
-          "z": -50
+          "z": -20
         }
       },
       "model": {
@@ -142,7 +142,7 @@
         "offset": -2.6,
         "position": {
           "y": 0,
-          "z": -50
+          "z": -20
         }
       },
       "model": {
@@ -163,7 +163,7 @@
         "offset": -2.4,
         "position": {
           "y": 2,
-          "z": -50
+          "z": -20
         }
       },
       "model": {
@@ -184,7 +184,7 @@
         "offset": -2.4,
         "position": {
           "y": -4.5,
-          "z": -50
+          "z": -20
         }
       },
       "model": {
@@ -205,7 +205,7 @@
         "offset": -1.2,
         "position": {
           "y": 2,
-          "z": -50
+          "z": -20
         }
       },
       "model": {
@@ -226,7 +226,7 @@
         "offset": -1.4,
         "position": {
           "y": -1.5,
-          "z": -50
+          "z": -20
         }
       },
       "model": {
@@ -247,7 +247,7 @@
         "offset": -1.4,
         "position": {
           "y": -3,
-          "z": -50
+          "z": -20
         }
       },
       "model": {
@@ -270,7 +270,7 @@
         "offset": 0,
         "position": {
           "y": 4.4,
-          "z": -50
+          "z": -20
         }
       },
       "model": {
@@ -291,7 +291,7 @@
         "offset": 0,
         "position": {
           "y": 3.6,
-          "z": -50
+          "z": -20
         }
       },
       "model": {
@@ -311,7 +311,7 @@
         "offset": -7,
         "position": {
           "y": 0.6,
-          "z": -50
+          "z": -20
         }
       },
       "model": {
@@ -332,7 +332,7 @@
         "offset": -7,
         "position": {
           "y": 0.6,
-          "z": -50
+          "z": -20
         }
       },
       "model": {

public/Chenzhebei-ShanxiMuseum/index.html

@@ -93,7 +93,6 @@ loadingBar.style.display = "block";
     script.src = loaderUrl;
     script.onload = () => {
         createUnityInstance(canvas, config, (progress) => {
-
             if (window.parent && window.parent !== window) {
                 window.parent.unityLoading(progress);
             }

public/Chenzhebei-ShanxiMuseum/unityExport.js

@@ -1,4 +1,3 @@
-
 //当需要显示热点Tag的时候触发, 该函数为unity主动调用的函数
 window.showTag = function (index) {
     if (window.parent && window.parent !== window) {
@@ -19,20 +18,14 @@ window.onModelControlled = function () {
     }
 }
 
-window.onClickMainHotspot = function(hotspotName){
-    if (window.parent && window.parent !== window) {
-        window.parent.onClickMainHotspot();
-    }
-}
-
 //更新配置
 window.refreshAppSettings = function (json) {
     window.unityInstance.SendMessage('MainCanvas', 'RefreshAppSettings', json)
 }
 
+//设置模型自动旋转, 0代表不自动旋转
 window.setModelAutoRotation = function(speed){
     window.unityInstance.SendMessage('MainCanvas', 'SetModelAutoRotation', speed)
-    
 }
 
 //切换背景图 (0目录页, 1玄石可观, 2石上春秋, 3碑刻密码, 4模型鉴赏) 这些名字对应的蓝湖设计的标题
@@ -40,7 +33,6 @@ window.changePanel = function (index) {
     window.unityInstance.SendMessage('MainCanvas', 'ChangePanel', index)
 }
 
-
 //聚焦热点, 对应玄石可观中的热点, 在调用之前需要先调用changPanel(1), 退出页面时需要调用showHotspot(-1)
 window.showHotspot = function (index) {
     window.unityInstance.SendMessage('MainCanvas', 'ShowHotspot', index)
@@ -74,4 +66,4 @@ window.addModelScale = function (value) {
 //重置模型, 对应蓝湖设计 "文物鉴赏-尺寸" 右侧的重置按钮
 window.resetModel = function () {
     window.unityInstance.SendMessage('MainCanvas', 'ResetModel')
-}
+}

src/assets/styles/base.less

@@ -581,4 +581,18 @@ textarea {
   img {
     object-fit: fill !important;
   }
-}
+}
+
+// 页面透明度渐变
+// #opacityCss {
+//   animation: opacityCss 2s linear forwards;
+// }
+
+// @keyframes opacityCss {
+//   0% {
+//     opacity: 0.5;
+//   }
+//   100% {
+//     opacity: 1;
+//   }
+// }

src/pages/A0base/index.module.scss

@@ -4,6 +4,7 @@
   background-color: #ccc;
   position: relative;
 
+
   :global {
     .A0baseContainner {
       width: 58%;
@@ -18,41 +19,44 @@
       align-items: center;
 
       .content {
-        width: 60%;
+        width: 68%;
         height: 100%;
         display: flex;
         flex-direction: column;
         gap: 10px;
+
         .title {
-          width: 150px;
           max-width: 80%;
-          font-size: 21px;
           color: rgba(124, 75, 54, 1);
           border-bottom: 1px solid rgba(93, 96, 96, 0.4);
+          width: 160px;
+          font-size: 26px;
         }
 
         .text {
           width: 90%;
           height: fit-content;
           max-height: 200px;
-          font-size: 13px;
-          line-height: 20px;
-          font-weight: lighter;
-          color: rgba(93, 96, 96, 1);
+          font-size: 16px;
+          line-height: 24px;
+          letter-spacing: 2px;
+          color: #504e40;
+          text-align: justify;
+          font-weight: 400;
         }
 
         .btn {
-          padding-top: 10px;
-          font-size: 14px;
           color: rgba(93, 96, 96, 1);
           cursor: pointer;
           position: relative;
+          font-size: 18px;
+          padding-top: 15px;
 
           &::before {
             content: '';
             position: absolute;
-            left: 55px;
-            top: 8px;
+            left: 72px;
+            top: 15px;
             width: 22px;
             height: 22px;
             background-image: url('../../assets/sgImg/icon_more.png');
@@ -94,12 +98,12 @@
 
     /* 互动 */
     .interact {
-      width: 60px;
-      height: 120px;
+      width: 100px;
+      height: 200px;
       position: absolute;
       z-index: 1;
       bottom: 5%;
-      left: 2%;
+      left: 0;
       display: flex;
       align-items: center;
       justify-content: flex-end;
@@ -135,11 +139,17 @@
       .inter_content_active {
         height: calc(100% - 50px);
         opacity: 1;
+
+        .inter {
+          margin: 4px 0;
+          height: 24px;
+          font-size: 16px;
+        }
       }
 
       .icon {
-        width: 50px;
-        height: 50px;
+        width: 64px;
+        height: 64px;
         cursor: pointer;
 
         img {
@@ -152,8 +162,8 @@
 
     /* 首页图标*/
     .home {
-      width: 30px;
-      height: 30px;
+      width: 44px;
+      height: 44px;
       position: absolute;
       z-index: 1;
       top: 3%;
@@ -179,16 +189,17 @@
       color: rgba(177, 150, 123, 1);
       cursor: pointer;
 
-      & > img {
-        height: 30px;
-        object-fit: contain;
+      &>img {
+        width: 44px;
+        object-fit: cover;
       }
 
-      & > .guideVideoTitle {
+      &>.guideVideoTitle {
         height: 12px;
         line-height: 8px;
-        font-size: 12px;
         font-weight: 500;
+        margin-top: 5px;
+        font-size: 16px;
       }
     }
   }
@@ -196,70 +207,15 @@
 
 // ------------移动端---------------
 
-.A0baseMo {
+.A0baseEn {
   :global {
-    .home {
-      width: 44px;
-      height: 44px;
-    }
-
-    .interact .icon {
-      width: 64px;
-      height: 64px;
-    }
-
-    .guideVideo {
-      & > img {
-        width: 44px;
-        object-fit: cover;
-      }
-
-      .guideVideoTitle {
-        margin-top: 5px;
-        font-size: 16px;
-      }
-    }
-
-    .A0baseContainner .content {
-      width: 68%;
-
-      .title {
-        width: 160px;
-        font-size: 26px;
-      }
-
-      .text {
-        font-size: 16px;
-        line-height: 24px;
-        letter-spacing: 2px;
-        color: #504e40;
-        text-align: justify;
-        font-weight: 400;
-      }
-
-      .btn {
-        font-size: 18px;
-        padding-top: 15px;
-
-        &::before {
-          left: 72px;
-          top: 15px;
-        }
-      }
-    }
-
-    .interact {
-      left: 0;
-      width: 100px;
-      height: 200px;
-
-      .inter_content_active {
-        .inter {
-          margin: 4px 0;
-          height: 24px;
-          font-size: 16px;
+    .A0baseContainner {
+      .content {
+        .title {
+          width: auto;
+          max-width: auto;
         }
       }
     }
   }
-}
+}

src/pages/A0base/index.tsx

@@ -1,6 +1,5 @@
 import React, { useState } from 'react'
 import styles from './index.module.scss'
-import { isPc } from '@/utils/http'
 import classNames from 'classnames'
 import { useSelector } from 'react-redux'
 import { RootState } from '@/store'
@@ -18,10 +17,11 @@ function A0base() {
     window.location.replace(path)
   }
 
-
-
   return (
-    <div className={classNames(isPc ? '' : styles.A0baseMo, styles.A0base)}>
+    <div
+      className={classNames(myLangue === 'ZH' ? '' : styles.A0baseEn, styles.A0base)}
+      id='opacityCss'
+    >
       <div className='A0baseContainner'>
         <div className={`content`}>
           <div className='title myFont'>{myData.baseInfo[currentBase].title}</div>
@@ -58,18 +58,24 @@ function A0base() {
           <div className='inter' onClick={() => window.location.replace('#/byzh')}>
             碑影智绘
           </div>
-          <div className='inter' onClick={() => {
-            Toast.show({
-              content: '正在开发中'
-            })
-          }}>
+          <div
+            className='inter'
+            onClick={() => {
+              Toast.show({
+                content: '正在开发中'
+              })
+            }}
+          >
             展览图谱
           </div>
-          <div className='inter' onClick={() => {
-            Toast.show({
-              content: '正在开发中'
-            })
-          }}>
+          <div
+            className='inter'
+            onClick={() => {
+              Toast.show({
+                content: '正在开发中'
+              })
+            }}
+          >
             AI问答
           </div>
         </div>
@@ -88,8 +94,6 @@ function A0base() {
         <img src={require('@/assets/img/guideVideo.png')} alt='' />
         <div className='guideVideoTitle'>先导片</div>
       </div>
-
-
     </div>
   )
 }

src/pages/A1home2/index.module.scss

@@ -121,9 +121,20 @@
 
 
 // --------------英文版
-// .A1homeEm {
-//   :global {
-//     .loadingP {
+.A1homeEm {
+  :global {
+    .loadingP {
+      .btn {
+        width: 70px;
+        height: 70px;
+
+        .txt {
+          width: 42px;
+          height: 21px;
+          font-size: 16px;
 
-//   }
-// }
+        }
+      }
+    }
+  }
+}

src/pages/A1home2/index.tsx

@@ -4,8 +4,8 @@ import classNames from 'classnames'
 import { domDelOwnFu } from '@/utils/utilsSome'
 import { useSelector } from 'react-redux'
 import { RootState } from '@/store'
-import { Toast } from 'antd-mobile'
 import Skip from '@/components/Skip'
+import { locSetLangue } from '@/utils/storage'
 
 function A1home() {
   const { myLangue } = useSelector((state: RootState) => state.A0Layout)
@@ -156,10 +156,10 @@ function A1home() {
           className='A1Launge'
           hidden={progress < 100}
           onClick={() => {
-            Toast.show({
-              content: '正在开发中'
-            })
-            // locSetLangue(myLangue==='ZH'?'EN':'ZH')
+            // Toast.show({
+            //   content: '正在开发中'
+            // })
+            locSetLangue(myLangue==='ZH'?'EN':'ZH')
           }}
         >
           <img src={require(`@/assets/sgImg/${myLangue}.png`)} alt='' />