Ver código fonte

概述总览 外观优化

任一存 2 anos atrás
pai
commit
ce5c8bc049

BIN
public/unity/Build/SHIndustryMuseum_2.4.framework.js.unityweb


BIN
public/unity/Build/SHIndustryMuseum_2.4.wasm.unityweb


BIN
public/unity/Build/SHIndustryMuseum_2.4.data.unityweb


BIN
public/unity/Build/SHIndustryMuseum_2.6.framework.js.unityweb


public/unity/Build/SHIndustryMuseum_2.4.loader.js → public/unity/Build/SHIndustryMuseum_2.6.loader.js


BIN
public/unity/Build/SHIndustryMuseum_2.6.wasm.unityweb


+ 7 - 7
src/App.vue

@@ -150,11 +150,11 @@ export default {
       var canvas = document.querySelector("#unity-canvas")
 
       var buildUrl = "unity/Build"
-      var loaderUrl = buildUrl + "/SHIndustryMuseum_2.4.loader.js"
+      var loaderUrl = buildUrl + "/SHIndustryMuseum_2.6.loader.js"
       var config = {
-        dataUrl: buildUrl + "/SHIndustryMuseum_2.4.data.unityweb",
-        frameworkUrl: buildUrl + "/SHIndustryMuseum_2.4.framework.js.unityweb",
-        codeUrl: buildUrl + "/SHIndustryMuseum_2.4.wasm.unityweb",
+        dataUrl: buildUrl + "/SHIndustryMuseum_2.6.data.unityweb",
+        frameworkUrl: buildUrl + "/SHIndustryMuseum_2.6.framework.js.unityweb",
+        codeUrl: buildUrl + "/SHIndustryMuseum_2.6.wasm.unityweb",
         streamingAssetsUrl: "StreamingAssets",
         companyName: "DefaultCompany",
         productName: "SHIndustryMuseum",
@@ -213,10 +213,9 @@ export default {
        */
     })
 
-
     const isShowNavBar = ref(true)
     const activeNavItemIdx = ref(0)
-    const navBarHeight = '100px'
+    const navBarHeight = '90px'
     return {
       isShowFadeInMask,
       progress,
@@ -261,7 +260,7 @@ html, body {
   src: url('@/assets/style/SOURCEHANSANSCN-LIGHT.OTF');
 }
 @font-face {
-  font-family: 'Source Han Sans CN-Light';
+  font-family: 'Source Han Sans CN-Regular';
   src: url('@/assets/style/SOURCEHANSANSCN-REGULAR.OTF');
 }
 @font-face {
@@ -376,6 +375,7 @@ html, body {
     position: fixed;
     left: 0;
     width: 100%;
+    height: rgba(210, 189, 132, 0.7);
     height: v-bind('navBarHeight');
     border-radius: 5px 5px 0 0;
     border-top: solid 1px #D2BD84;

BIN
src/assets/images/mask-general-map.png


+ 24 - 6
src/views/General.vue

@@ -2,6 +2,12 @@
   <div
     class="general"
   >
+    <img
+      class="map-mask"
+      src="@/assets/images/mask-general-map.png"
+      alt=""
+      draggable="false"
+    >
     <h1
       :title="activeCorpInfo?.name || '上海市工业博物馆'"
     >
@@ -211,8 +217,9 @@ export default {
           const element = corpListRaw.value[index]
           if (element.id === id) {
             window.gUnityInst.SendMessage('Panel1', 'ShowEnterprise', element.id) //显示某个企业
-            window.gUnityInst.SendMessage('Panel1', 'SetEnterpriseUnSelected', element.id) //高亮某个企业
+            window.gUnityInst.SendMessage('Panel1', 'SetEnterpriseSelected', element.id) //高亮某个企业
           } else {
+            window.gUnityInst.SendMessage('Panel1', 'SetEnterpriseUnselected', element.id) //高亮某个企业
             window.gUnityInst.SendMessage('Panel1', 'HideEnterprise', element.id) //隐藏某个企业
           }
         }
@@ -273,6 +280,14 @@ export default {
 <style lang="less" scoped>
 .general {
   height: 100%;
+  >.map-mask {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    pointer-events: none;
+  }
   >h1 {
     position: absolute;
     top: 51px;
@@ -372,7 +387,8 @@ export default {
         position: relative;
         width: 363px;
         height: 50px;
-        background: linear-gradient(90deg, #3A454F 0%, rgba(22,28,33,0) 100%);
+        background: linear-gradient(90deg, rgba(58, 69, 79, 0.5) 0%, rgba(22,28,33,0) 100%);
+        // background: linear-gradient(90deg, #3A454F 0%, rgba(22,28,33,0) 100%);
         backdrop-filter: blur(3px);
         border-radius: 3px 3px 3px 3px;
         opacity: 1;
@@ -394,7 +410,7 @@ export default {
           transform: translateY(-50%);
           width: 8px;
           height: 8px;
-          background: #6D9DC6;
+          background: #9AA4AB;
           z-index: 2;
           box-shadow: 0px 0px 12px 0px #6D9DC6, 0px 0px 8px 0px #6D9DC6;
         }
@@ -414,8 +430,7 @@ export default {
         }
         &:last-of-type {
           >.verticle-line {
-            top: initial;
-            bottom: 50%;
+            height: 25px;
           }
         }
         &:first-of-type:last-of-type {
@@ -478,7 +493,7 @@ export default {
   >article {
     position: absolute;
     top: 74px;
-    right: 0;
+    right: 102px;
     width: 653px;
     height: calc(100% - 74px - 50px);
     max-height: 740px;
@@ -490,6 +505,9 @@ export default {
     padding: 32px 50px 50px 50px;
     display: flex;
     flex-direction: column;
+    @media only screen and (max-width: 1700px) {
+      right: 0;
+    }
     >button.close {
       position: absolute;
       top: 30px;