Merge branch 'master' of http://192.168.0.115:3000/lanxin/Chengzhebei

public/myData/myData.js

@@ -2035,7 +2035,7 @@ const myDataTemp = {
         {
           name: '袁安碑',
           time: '东汉永元四年(92年)',
-          desc: '高3.58米，宽1.65米，厚0.32米(核对），为东汉碑刻之最，其形制宏巨正反映当时崇碑风气之盛。',
+          desc: '高3.58米，宽1.65米，厚0.32米，为东汉碑刻之最，其形制宏巨正反映当时崇碑风气之盛。',
           img: ['./myData/knowlegeImg/bjzcyczb-lhzj-yab-1.png'],
           from: '图片来源：河南博物院官网',
           img_ac: ['./myData/knowlegeImg/bjzcyczb-lhzj-yab-2.png'],
@@ -3201,7 +3201,7 @@ const knowlegeData = [
                         type: 2,
                         needIndent: true,
                         content: `<p>东汉永元四年(92年)</p>
-<p>高3.58米，宽1.65米，厚0.32米(核对），为东汉碑刻之最，其形制宏巨正反映当时崇碑风气之盛。</p>`,
+<p>高3.58米，宽1.65米，厚0.32米，为东汉碑刻之最，其形制宏巨正反映当时崇碑风气之盛。</p>`,
                         imgs: [
                           {
                             path: `./myData/knowlegeImg/bjzcyczb-lhzj-yab-1.png`,

public/myData/myDataEN.js

@@ -1937,7 +1937,7 @@ const myDataTemp2 = {
         {
           name: '袁安碑',
           time: '东汉永元四年(92年)',
-          desc: '高3.58米，宽1.65米，厚0.32米(核对），为东汉碑刻之最，其形制宏巨正反映当时崇碑风气之盛。',
+          desc: '高3.58米，宽1.65米，厚0.32米，为东汉碑刻之最，其形制宏巨正反映当时崇碑风气之盛。',
           img: ['./myData/knowlegeImg/bjzcyczb-lhzj-yab-1.png'],
           from: '图片来源：河南博物院官网',
           img_ac: ['./myData/knowlegeImg/bjzcyczb-lhzj-yab-2.png'],
@@ -3103,7 +3103,7 @@ const myDataTemp2 = {
 //                         type: 2,
 //                         needIndent: true,
 //                         content: `<p>东汉永元四年(92年)</p>
-// <p>高3.58米，宽1.65米，厚0.32米(核对），为东汉碑刻之最，其形制宏巨正反映当时崇碑风气之盛。</p>`,
+// <p>高3.58米，宽1.65米，厚0.32米，为东汉碑刻之最，其形制宏巨正反映当时崇碑风气之盛。</p>`,
 //                         imgs: [
 //                           {
 //                             path: `./myData/knowlegeImg/bjzcyczb-lhzj-yab-1.png`,

public/unityMo/StreamingAssets/Settings.json

@@ -606,9 +606,9 @@
       "startIntensity": 0,
       "camera": {
         "position": {
-          "x": 1.6,
-          "y": 2.7,
-          "z": -5
+          "x": 1.8,
+          "y": 2,
+          "z": -7
         },
         "physicalLensShift": {
           "x": 0.25,
@@ -649,7 +649,7 @@
       "startIntensity": 0,
       "camera": {
         "position": {
-          "x": 0,
+          "x": 2,
           "y": 0,
           "z": -12
         },
@@ -692,7 +692,7 @@
       "startIntensity": 0,
       "camera": {
         "position": {
-          "x": 0,
+          "x": 2,
           "y": 0,
           "z": -12
         },

public/unityPc/StreamingAssets/Settings.json

@@ -606,9 +606,9 @@
       "startIntensity": 0,
       "camera": {
         "position": {
-          "x": 1.6,
-          "y": 2.7,
-          "z": -5
+          "x": 1.8,
+          "y": 2,
+          "z": -7
         },
         "physicalLensShift": {
           "x": 0.25,
@@ -649,7 +649,7 @@
       "startIntensity": 0,
       "camera": {
         "position": {
-          "x": 0,
+          "x": 2,
           "y": 0,
           "z": -12
         },
@@ -692,7 +692,7 @@
       "startIntensity": 0,
       "camera": {
         "position": {
-          "x": 0,
+          "x": 2,
           "y": 0,
           "z": -12
         },

src/pages/A2yblm/components/ModalTxt/index.module.scss

@@ -128,10 +128,23 @@
         flex-direction: column;
         justify-content: center;
         // height: 330px;
+        position: relative;
+
+        &::before {
+          content: '';
+          position: absolute;
+          top: 15px;
+          left: 15px;
+          width: 14px;
+          height: 14px;
+          background-image: url(../../../../assets/img/A2_backDian.png);
+          background-size: 100% 100%;
+
+        }
 
         .intro_title {
           height: 30px;
-          font-size: 22px;
+          font-size: 20px;
           line-height: 30px;
           color: rgba(124, 75, 54, 1);
           font-weight: bold;
@@ -167,7 +180,7 @@
           height: 30px;
           background-image: url(../../../../assets/img/A2_ywyw_btn.png);
           background-position: center;
-          background-size: 100% 100%;
+          background-size: 100% auto;
           padding-left: 35px;
           line-height: 30px;
           font-size: 15px;
@@ -197,7 +210,7 @@
       }
 
       .translateModal {
-        background-image: url(../../../../assets/img/A2_front.png);
+        background-image: url(../../../../assets/img/A2_back.png);
         background-position: center;
         background-size: 100% 100%;
         width: 100%;
@@ -205,6 +218,19 @@
         display: flex;
         align-items: center;
         justify-content: center;
+        position: relative;
+
+        &::before {
+          content: '';
+          position: absolute;
+          top: 15px;
+          right: 15px;
+          width: 14px;
+          height: 14px;
+          background-image: url(../../../../assets/img/A2_backDian.png);
+          background-size: 100% 100%;
+
+        }
 
         .txtWithTrans {
           font-size: 16px !important;

src/pages/A6ybwx/Sangzang/components/Policy/index.module.scss

@@ -71,7 +71,7 @@
             width: 100%;
             height: 54%;
 
-            & > img {
+            &>img {
               width: 100%;
               height: 100%;
               object-fit: fill;
@@ -98,30 +98,13 @@
             overflow: auto;
             font-size: 16px;
             line-height: 24px;
-            letter-spacing: 2px;
+            // letter-spacing: 2px;
             font-weight: 400;
             color: rgba(69, 68, 55, 1);
             white-space: normal;
             transition: width 0.6s ease-in-out, padding 0.86s ease-in-out, opacity 0.3s ease-in-out;
 
-            &::before {
-              content: '';
-              position: absolute;
-              bottom: 0;
-              left: 0;
-              width: 100%;
-              height: 40%;
-              pointer-events: none;
-              z-index: 1;
-              // background-image: url('../../../../../assets/sgImg/mask.png');
-              // background-size: 100% 100%;
-              background: linear-gradient(
-                to top,
-                rgba(255, 255, 255, 1),
-                20%,
-                rgba(255, 255, 255, 0)
-              );
-            }
+
 
             &::-webkit-scrollbar {
               width: 0;
@@ -133,7 +116,7 @@
             background-image: url('../../../../../assets/img/A6_policy_part_bg1.jpg');
             background-size: #ddd6c2;
             background-size: 100% 100%;
-            padding-bottom: 60px;
+            padding-bottom: 40px;
 
             .part1Box {
               width: 100%;
@@ -180,6 +163,23 @@
                 height: fit-content;
               }
             }
+
+            &::before {
+              content: '';
+              position: absolute;
+              bottom: 0;
+              left: 0;
+              width: 100%;
+              height: 30%;
+              pointer-events: none;
+              z-index: 10;
+              // background-image: url('../../../../../assets/sgImg/mask.png');
+              // background-size: 100% 100%;
+              background: linear-gradient(to top,
+                  rgba(255, 255, 255, 0.8),
+                  20%,
+                  rgba(255, 255, 255, 0));
+            }
           }
 
           .part2 {
@@ -201,7 +201,7 @@
               justify-content: space-between;
               text-align: center;
 
-              & > img {
+              &>img {
                 height: 78%;
                 max-width: 50%;
                 object-fit: contain;
@@ -261,7 +261,7 @@
                   position: relative;
                   font-size: 15px;
 
-                  & > img {
+                  &>img {
                     position: absolute;
                     top: 50%;
                     left: 50%;
@@ -289,13 +289,14 @@
 
             .desc {
               letter-spacing: 0px;
-              line-height: 20px;
+              line-height: 18px;
               width: 100%;
               height: 20%;
               white-space: normal;
               overflow: auto;
               text-align: justify;
-              font-size: 15px;
+              font-size: 14px;
+              color: #454437;
 
               &::-webkit-scrollbar {
                 width: 0;
@@ -343,7 +344,7 @@
           color: #7c4b36;
         }
 
-        & > img {
+        &>img {
           height: 24px;
           object-fit: contain;
         }
@@ -368,4 +369,4 @@
       }
     }
   }
-}
+}