aamin пре 1 година
родитељ
комит
7e7510db6e

+ 1 - 1
scene2/public/static/js/loadCAD.js

@@ -42,7 +42,7 @@ window.grendCAD = (function grendCAD() {
         top: 20px;
         width: 180px;
         height: 180px;
-        background: rgb(146 3 3 / 37%);
+        background: rgb(151 146 146 / 37%);
         backdrop-filter:blur(10px);
         border-radius: 5px;
         pointer-events: none;

BIN
scene2/src/assets/images/icon/auto.png


BIN
scene2/src/assets/images/icon/auto_active.png


BIN
scene2/src/assets/images/icon/back-icon.png


BIN
scene2/src/assets/images/icon/dollhouse.png


BIN
scene2/src/assets/images/icon/dollhouse_active.png


BIN
scene2/src/assets/images/icon/floor.png


BIN
scene2/src/assets/images/icon/floor_active .png


BIN
scene2/src/assets/images/icon/floor_active.png


BIN
scene2/src/assets/images/icon/fullscree_active.png


BIN
scene2/src/assets/images/icon/fullscreen.png


BIN
scene2/src/assets/images/icon/inside.png


BIN
scene2/src/assets/images/icon/inside_active.png


BIN
scene2/src/assets/images/icon/pause.png


BIN
scene2/src/assets/images/icon/play.png


BIN
scene2/src/assets/img/music.png


BIN
scene2/src/assets/img/musicAc.png


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


+ 10 - 6
scene2/src/assets/style/myBase.css

@@ -17,13 +17,15 @@
   color: #fff;
 }
 #thumb-container .active .overlay {
-  color: #D6B970;
+  color: #911212;
 }
 #thumb-container .active > img {
-  border: 3px solid #D6B970;
+  border: 3px solid #911212;
 }
 #drawer {
-  background-color: #911212;
+  /* background-color: #911212; */
+  background: #61616167;
+  backdrop-filter: blur(10px);
   border-radius: 30px 30px 0 0;
 }
 #drawer .darkGlass {
@@ -31,7 +33,9 @@
 }
 #progressBar .step.active::before,
 #progressBar .step.recent::before {
-  background-color: #D6B970;
+  /* background-color: #D6B970; */
+  background-color: #911212 ;
+
 }
 #popup {
   background: none;
@@ -41,11 +45,11 @@
 }
 #cad path {
   stroke-width: 0.5;
-  fill: #911212;
+  fill: #61616167;
   stroke: #fff;
 }
 #ele1 circle {
-  fill: #911212;
+  fill: #61616167;
   r: 1;
 }
 #share-modal {

+ 9 - 10
scene2/src/components/info/index.vue

@@ -11,7 +11,6 @@
           </div>
         </div>
       </div>
-      <div class="line"></div>
       <img src="../../assets/img/infoIcon.png" alt="" />
     </div>
     <div class="disc-box" v-show="isShow" v-html="disc"></div>
@@ -62,16 +61,17 @@ export default {
   left: 10px;
   /* transform: translateX(-50%); */
   color: #fff;
+  margin-left: 50px;
 
   .title-box {
     width: 100%;
     height: 100%;
     display: flex;
-    justify-content: center;
+    justify-content: left;
     align-items: center;
-    background: url("../../assets/img/infoBg.png");
-    background-size: 100% 100%;
-    font-size: 1em;
+    // background: url("../../assets/img/infoBg.png");
+    // background-size: 100% 100%;
+    font-size: 1.2em;
     font-family: "AdobeHeitiStd";
     cursor: pointer;
     padding: 0 20px;
@@ -84,21 +84,20 @@ export default {
     }
 
     img {
-      // width: 25px;
-      // height: 25px;
-      margin-left: 15px;
-      // margin-top: 10px;
+      width: 15px;
+      margin-left: 10px;
     }
   }
 
   .disc-box {
     max-width: 300px;
-    background: #5e1b13a4;
+    background: #00000041;
     backdrop-filter: blur(10px);
     padding: 30px;
     text-indent: 2em;
     line-height: 25px;
     letter-spacing: 2px;
+    border-radius: 10px;
   }
 }
 

+ 1 - 1
scene2/src/views/gui/components/hotList.vue

@@ -107,7 +107,7 @@ export default {
           border-bottom: 1px solid #f0e2c0;
         }
         &:hover {
-          color: #d6b970;
+          color: #911212;
         }
       }
       .active {

+ 5 - 2
scene2/src/views/gui/guide.vue

@@ -26,14 +26,17 @@ export default {
 </script>
 <style lang="less" scoped>
 #status {
-  background-color: #911212;
+  background-color: #61616167;
+  backdrop-filter: blur(20px);
   color: #fff;
 }
 #progressBar {
   height: 100%;
   display: flex;
   align-items: center;
-  background-color: #911212;
+  background-color: #61616167;
+  backdrop-filter: blur(20px);
+
 }
 #playHead {
   background-color: transparent;

+ 21 - 19
scene2/src/views/gui/menu.vue

@@ -3,6 +3,7 @@
     <div class="pinBottom center">
       <div id="view-controllers"></div>
     </div>
+    <img @click="toHome()" class="back-icon" src="@/assets/images/icon/back-icon.png" alt="">
     <div class="pinBottom left">
       <div>
         <div class="viewContainer">
@@ -64,11 +65,10 @@
             </div>
 
             <!-- 热点列表 -->
-            <div id="myHotList" @click="openInd = 1">
-              <!-- 鼠标移入的显示 -->
+            <!-- <div id="myHotList" @click="openInd = 1">
               <div class="hoverTit">热点列表</div>
               <img src="../../assets/img/hot.png" alt="" />
-            </div>
+            </div> -->
 
             <div data-original-title="VR" id="vr" rel="tooltip" title="" style="display: none">
               <img class="icon icon-inside" :src="require('@/assets/images/VR.png')" />
@@ -107,11 +107,10 @@
         </div>
 
         <!-- 回到pc页面(首页) -->
-        <div class="toHomeBox" @click="toHomeFu">
-          <!-- 鼠标移入的显示 -->
+        <!-- <div class="toHomeBox" @click="toHomeFu">
           <div class="hoverTit">回到首页</div>
           <img src="../../assets/img/toHome.png" alt="" />
-        </div>
+        </div> -->
 
         <!-- vr -->
         <!-- <div class="toHomeBox" @click="openVR">
@@ -140,16 +139,13 @@
             <img src="/code.png" />
             <div>扫一扫,分享VR时空</div>
           </div>
-          <img src="../../assets/img/share.png" />
+          <img style="width: 30px;" src="../../assets/img/share.png" />
         </div>
 
         <!-- 全屏 -->
         <div class="toHomeBox quanping">
-          <!-- 鼠标移入的显示 -->
           <div class="hoverTit">{{ isFull ? '退出全屏' : '全屏' }}</div>
-          <!-- 打开全屏 -->
           <img @click="fullClick" v-show="!isFull" src="../../assets/images/icon/fullscreen.png" alt="" />
-          <!-- 退出全屏 -->
           <img @click="exitfull" v-show="isFull" src="../../assets/images/icon/fullscree_active.png" alt="" />
         </div>
       </div>
@@ -290,11 +286,11 @@ export default {
   position: absolute;
   width: 150px;
   left: 50%;
-  top: -420%;
+  top: -630%;
   // transform: translateY(120%);
   transform: translateX(-50%);
-  background: #911212bd;
-  backdrop-filter: blur(20px);
+  background: #61616167;
+  backdrop-filter: blur(10px);
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -351,7 +347,7 @@ export default {
 }
 
 // 右侧菜单栏
-@wh: 44px;
+@wh: 35px;
 @margin: 0px;
 
 #play,
@@ -398,17 +394,23 @@ export default {
 .pinBottom.right .ui-icon {
   background: none;
 }
+.back-icon {
+  position: fixed;
+  top: 20px;
+  left: 20px;
+  cursor: pointer;
+}
 
 #gui-fullscreen img {
-  width: 44px;
+  width: 35px;
 }
 
 #volume {
-  width: 44px;
+  width: 35px;
 }
 
 #gui-fullscreen-exit img {
-  width: 44px !important;
+  width: 35px !important;
 }
 
 .bgandshare {
@@ -429,10 +431,10 @@ export default {
   margin-right: 20px;
   cursor: pointer;
   position: relative;
-  width: 44px;
+  width: 35px;
 
   img {
-    width: 44px;
+    width: 35px;
   }
 
   &:hover {