2 Commits 3489b91121 ... e3efa3302e

Auteur SHA1 Bericht Datum
  lanxin e3efa3302e Merge branch 'master' of http://192.168.0.115:3000/lanxin/yinjiescene 2 weken geleden
  lanxin d5521a17ff update 2 weken geleden
52 gewijzigde bestanden met toevoegingen van 107 en 61 verwijderingen
  1. BIN
      Hot/src/assets/images/pc/hot_bg.png
  2. BIN
      Hot/src/assets/images/pc/hot_bg_M.png
  3. BIN
      Hot/src/assets/images/pc/icon-left.png
  4. BIN
      Hot/src/assets/images/pc/icon-right.png
  5. BIN
      Hot/src/assets/images/pc/left.png
  6. BIN
      Hot/src/assets/images/pc/right.png
  7. 6 5
      Hot/src/views/Home.vue
  8. 1 1
      Scene/public/css/main.css
  9. 4 4
      Scene/public/css/oldVer/main0.css
  10. BIN
      Scene/public/images/Volume btn_off.png
  11. BIN
      Scene/public/images/Volume btn_on.png
  12. BIN
      Scene/public/images/auto-suspend.png
  13. BIN
      Scene/public/images/auto.png
  14. BIN
      Scene/public/images/close1.png
  15. BIN
      Scene/public/images/dollhouse.png
  16. BIN
      Scene/public/images/dollhouse_active.png
  17. BIN
      Scene/public/images/floor.png
  18. BIN
      Scene/public/images/floor_active.png
  19. BIN
      Scene/public/images/full.png
  20. BIN
      Scene/public/images/fullx.png
  21. BIN
      Scene/public/images/hotlist.png
  22. BIN
      Scene/public/images/inside.png
  23. BIN
      Scene/public/images/inside_active.png
  24. BIN
      Scene/public/images/pause.png
  25. BIN
      Scene/public/images/play.png
  26. BIN
      Scene/public/images/toolBar_bg.png
  27. BIN
      Scene/src/assets/img/close.png
  28. BIN
      Scene/src/assets/img/like.png
  29. BIN
      Scene/src/assets/img/likeAc.png
  30. BIN
      Scene/src/assets/img/nextP.png
  31. BIN
      Scene/src/assets/img/preP.png
  32. BIN
      Scene/src/assets/img/section.png
  33. BIN
      Scene/src/assets/img/section1.1.png
  34. BIN
      Scene/src/assets/img/section1.2.png
  35. BIN
      Scene/src/assets/img/section1.3.png
  36. BIN
      Scene/src/assets/img/section1.png
  37. BIN
      Scene/src/assets/img/section2.1.png
  38. BIN
      Scene/src/assets/img/section2.2.png
  39. BIN
      Scene/src/assets/img/section2.3.png
  40. BIN
      Scene/src/assets/img/section2.4.png
  41. BIN
      Scene/src/assets/img/section2.png
  42. BIN
      Scene/src/assets/img/section3.png
  43. BIN
      Scene/src/assets/img/section4.png
  44. BIN
      Scene/src/assets/img/section5.png
  45. BIN
      Scene/src/assets/img/share.png
  46. BIN
      Scene/src/assets/img/splitImg.png
  47. BIN
      Scene/src/assets/img/toolBar_bg.png
  48. BIN
      Scene/src/assets/img/view.png
  49. 0 1
      Scene/src/pages/A0base/index.tsx
  50. 45 28
      Scene/src/pages/A2main/index.module.scss
  51. 44 12
      Scene/src/pages/A2main/index.tsx
  52. 7 10
      Scene/src/pages/A3hotList/index.module.scss

BIN
Hot/src/assets/images/pc/hot_bg.png


BIN
Hot/src/assets/images/pc/hot_bg_M.png


BIN
Hot/src/assets/images/pc/icon-left.png


BIN
Hot/src/assets/images/pc/icon-right.png


BIN
Hot/src/assets/images/pc/left.png


BIN
Hot/src/assets/images/pc/right.png


+ 6 - 5
Hot/src/views/Home.vue

@@ -302,11 +302,11 @@ export default {
     width: 100%;
     margin: 0 auto;
     height: 100%;
-    padding: 30px 50px 20px 20px;
+    padding: 30px 20px 20px 20px;
     display: flex;
     align-items: center;
     flex-direction: column;
-
+    gap: 20px;
     justify-content: center;
     .myTitle {
       font-size: 22px;
@@ -338,7 +338,7 @@ export default {
       border-radius: 6px;
       overflow: hidden;
       width: 700px;
-      height: calc(100% - 270px);
+      height: calc(100% - 240px);
       margin-top: 40px;
       .oneTabNum {
         z-index: 10;
@@ -394,8 +394,8 @@ export default {
         top: 50%;
         transform: translateY(-50%);
         left: 30px;
-        width: 80px;
-        height: 99px;
+        width: 40px;
+        height: 60px;
         background-image: url("../assets/images/pc/left.png");
         background-size: 100% 100%;
         z-index: 1;
@@ -416,6 +416,7 @@ export default {
     .txtBox {
       height: 0;
       flex: 1;
+      width: 100%;
       .flooTxt {
         margin: 0 auto;
         margin-top: 10px;

+ 1 - 1
Scene/public/css/main.css

@@ -4769,7 +4769,7 @@ a.tag-link {
   .pinBottom.left .ui-icon.wide,
   .ui-icon {
     font-size: 22px;
-    text-shadow: 0 0 5px rgba(0, 0, 0, 0.9);
+    /* text-shadow: 0 0 5px rgba(0, 0, 0, 0.9); */
   }
   .pinBottom.right {
     right: 0;

+ 4 - 4
Scene/public/css/oldVer/main0.css

@@ -78,8 +78,8 @@ iframe {
 }
 .popup-content {
   position: relative;
-  width: 70%;
-  height: 80%;
+  width: 60%;
+  height: 70%;
   overflow: hidden;
 }
 #id1 {
@@ -98,7 +98,7 @@ iframe {
   background-size: 100% 100%;
   position: absolute;
   top: 80px;
-  right: 200px;
+  right: 350px;
 }
 .specialTitle {
   bottom: 65%;
@@ -235,7 +235,7 @@ a {
     width: 30px;
     height: 30px;
     position: absolute;
-    top: 70px;
+    top: 90px;
     right: 25px;
   }
 

BIN
Scene/public/images/Volume btn_off.png


BIN
Scene/public/images/Volume btn_on.png


BIN
Scene/public/images/auto-suspend.png


BIN
Scene/public/images/auto.png


BIN
Scene/public/images/close1.png


BIN
Scene/public/images/dollhouse.png


BIN
Scene/public/images/dollhouse_active.png


BIN
Scene/public/images/floor.png


BIN
Scene/public/images/floor_active.png


BIN
Scene/public/images/full.png


BIN
Scene/public/images/fullx.png


BIN
Scene/public/images/hotlist.png


BIN
Scene/public/images/inside.png


BIN
Scene/public/images/inside_active.png


BIN
Scene/public/images/pause.png


BIN
Scene/public/images/play.png


BIN
Scene/public/images/toolBar_bg.png


BIN
Scene/src/assets/img/close.png


BIN
Scene/src/assets/img/like.png


BIN
Scene/src/assets/img/likeAc.png


BIN
Scene/src/assets/img/nextP.png


BIN
Scene/src/assets/img/preP.png


BIN
Scene/src/assets/img/section.png


BIN
Scene/src/assets/img/section1.1.png


BIN
Scene/src/assets/img/section1.2.png


BIN
Scene/src/assets/img/section1.3.png


BIN
Scene/src/assets/img/section1.png


BIN
Scene/src/assets/img/section2.1.png


BIN
Scene/src/assets/img/section2.2.png


BIN
Scene/src/assets/img/section2.3.png


BIN
Scene/src/assets/img/section2.4.png


BIN
Scene/src/assets/img/section2.png


BIN
Scene/src/assets/img/section3.png


BIN
Scene/src/assets/img/section4.png


BIN
Scene/src/assets/img/section5.png


BIN
Scene/src/assets/img/share.png


BIN
Scene/src/assets/img/splitImg.png


BIN
Scene/src/assets/img/toolBar_bg.png


BIN
Scene/src/assets/img/view.png


+ 0 - 1
Scene/src/pages/A0base/index.tsx

@@ -1,6 +1,5 @@
 import React, { useState } from 'react'
 import isMobile from '../../utils/isMobile'
-
 import A1home from '../A1home'
 import styles from './index.module.scss'
 function A0base() {

+ 45 - 28
Scene/src/pages/A2main/index.module.scss

@@ -18,14 +18,14 @@
       line-height: 30px;
       text-align: center;
       font-size: 14px;
-      color: #326f64;
+      color: #242764;
     }
 
     // 样式重置
     .pinBottom.left {
       width: 960px;
       margin-right: 350px;
-      height: 85px;
+      height: 95px;
       left: 50%;
       transform: translateX(-50%);
       background-size: contain;
@@ -56,6 +56,7 @@
 
     #gui-modes-map {
       margin-left: 30px;
+      background: #d5cfca;
       #play,
       #pause,
       #next,
@@ -67,6 +68,7 @@
         width: 45px;
         height: 45px;
         margin-left: 30px;
+
         background-color: transparent !important;
         position: relative;
 
@@ -87,6 +89,7 @@
       display: flex;
       justify-content: flex-end;
       align-items: center;
+      background: #d5cfca;
       gap: 30px;
       .likeBox,
       .A2_map_box,
@@ -153,7 +156,7 @@
         z-index: 100;
         left: -18px;
         bottom: 0;
-        text-shadow: 1px 1px 1px #fcda99;
+        // text-shadow: 1px 1px 1px #fcda99;
         opacity: 0;
         pointer-events: none;
       }
@@ -238,7 +241,7 @@
       bottom: 40px;
       right: 30px;
       .sectionIndexImg {
-        width: 125px;
+        width: 90px;
         height: 100%;
         object-fit: cover;
         cursor: pointer;
@@ -270,12 +273,12 @@
         padding: 0 20px;
         width: fit-content;
         overflow: auto;
-        height: 89%;
+        height: 85%;
         width: 100%;
         display: flex;
         flex-wrap: nowrap;
         scroll-behavior: smooth;
-        justify-content: center;
+        justify-content: flex-start;
         align-items: center;
         gap: 20px;
         ::-webkit-scrollbar {
@@ -286,53 +289,67 @@
 
         & > div {
           flex: 0 0 auto;
-          width: 19%;
-          height: 91%;
+          width: 16%;
+          height: 75%;
+          align-self: end;
           background-size: contain;
           cursor: pointer;
           p {
-            margin-top: 250px;
+            margin-top: 325px;
             padding: 38px;
             font-size: 13px;
             line-height: 21px;
             text-indent: 2em;
+            color: #d5cdc8;
+            letter-spacing: 1px;
           }
         }
         .section1 {
+          width: 17%;
+          height: 95%;
           background: url(../../assets/img/section1.png) no-repeat;
           background-size: 100% 100%;
-          p {
-            color: #000000;
+          & > p {
+            margin-top: 435px;
           }
         }
         .section2 {
-          background: url(../../assets/img/section2.png) no-repeat;
+          background: url(../../assets/img/section1.1.png) no-repeat;
           background-size: 100% 100%;
-          p {
-            color: #fff;
-          }
         }
         .section3 {
-          background: url(../../assets/img/section3.png) no-repeat;
+          background: url(../../assets/img/section1.2.png) no-repeat;
           background-size: 100% 100%;
-          p {
-            color: #fff;
-          }
         }
         .section4 {
-          background: url(../../assets/img/section4.png) no-repeat;
+          background: url(../../assets/img/section1.3.png) no-repeat;
           background-size: 100% 100%;
-          p {
-            color: #000;
-          }
         }
         .section5 {
-          background: url(../../assets/img/section5.png) no-repeat;
+          width: 17%;
+          height: 95%;
+          background: url(../../assets/img/section2.png) no-repeat;
           background-size: 100% 100%;
-          p {
-            color: #000;
+          & > p {
+            margin-top: 445px;
           }
         }
+        .section6 {
+          background: url(../../assets/img/section2.1.png) no-repeat;
+          background-size: 100% 100%;
+        }
+        .section7 {
+          background: url(../../assets/img/section2.2.png) no-repeat;
+          background-size: 100% 100%;
+        }
+        .section8 {
+          background: url(../../assets/img/section2.3.png) no-repeat;
+          background-size: 100% 100%;
+        }
+        .section9 {
+          background: url(../../assets/img/section2.4.png) no-repeat;
+          background-size: 100% 100%;
+        }
       }
       .sectionClose {
         position: fixed;
@@ -349,8 +366,8 @@
         height: 20px;
         top: 24px;
         font-size: 10px;
-        color: #fff;
-        text-shadow: 0 0 5px rgba(253, 251, 178, 0.8), 0 0 10px rgba(253, 251, 178, 0.6);
+        color: #242764;
+        // text-shadow: 0 0 5px rgba(253, 251, 178, 0.8), 0 0 10px rgba(253, 251, 178, 0.6);
       }
       #gui-modes-map {
         border-radius: 25px;

File diff suppressed because it is too large
+ 44 - 12
Scene/src/pages/A2main/index.tsx


+ 7 - 10
Scene/src/pages/A3hotList/index.module.scss

@@ -20,8 +20,8 @@
       height: 100%;
       // background: url('../../assets/img/hotlist_bg.png') center center;
       // background-size: cover;
-      background-color: #77382f;
-      color: #f8f1e4;
+      background-color: #d1ccc6;
+      color: #242764;
       font-size: 17px;
       font-weight: 500;
       overflow: auto;
@@ -34,7 +34,7 @@
         padding: 40px 0 10px 0;
         font-size: 24px;
         font-weight: 400;
-        color: #fdf6e9;
+        color: #2d2d45;
       }
       .A3item {
         display: flex;
@@ -45,7 +45,7 @@
         padding: 4px 3px;
         cursor: pointer;
         &:hover {
-          background-color: #a16f5d;
+          background-color: #807b98;
         }
       }
       .A3close {
@@ -53,7 +53,7 @@
         bottom: 0;
         width: 350px;
         height: 50px;
-        background-color: #77382f;
+        background-color: #d1ccc6;
         border-top: 1px solid rgba(43, 31, 23, 0.1);
         cursor: pointer;
         &:hover {
@@ -95,17 +95,14 @@
         .A3item {
           font-size: 13px;
           padding: 10px 3px;
-          &:touch {
-            background-color: rgba(163, 143, 116, 1);
-          }
         }
         .A3close {
           width: 100%;
           height: 40px;
           border-top: 1px solid rgba(43, 31, 23, 0.1);
           img {
-            width: 16px;
-            height: 16px;
+            width: 25px;
+            height: 25px;
           }
         }
       }