Merge branch 'link-backend' of http://face3d.4dage.com:7005/renyicun/ShangHaiInustrialMuseum into link-backend

src/App.vue

@@ -210,11 +210,11 @@ export default {
       var canvas = document.querySelector("#unity-canvas")
 
       var buildUrl = "unity/Build"
-      var loaderUrl = buildUrl + "/SHIndustryMuseum_2.12.loader.js"
+      var loaderUrl = buildUrl + "/SHIndustryMuseum_2.13.loader.js"
       var config = {
-        dataUrl: buildUrl + "/SHIndustryMuseum_2.12.data.unityweb",
-        frameworkUrl: buildUrl + "/SHIndustryMuseum_2.12.framework.js.unityweb",
-        codeUrl: buildUrl + "/SHIndustryMuseum_2.12.wasm.unityweb",
+        dataUrl: buildUrl + "/SHIndustryMuseum_2.13.data.unityweb",
+        frameworkUrl: buildUrl + "/SHIndustryMuseum_2.13.framework.js.unityweb",
+        codeUrl: buildUrl + "/SHIndustryMuseum_2.13.wasm.unityweb",
         streamingAssetsUrl: "StreamingAssets",
         companyName: "DefaultCompany",
         productName: "SHIndustryMuseum",

src/views/General.vue

@@ -208,7 +208,7 @@ export default {
       })
     })
 
-    // 自动选中第一个条目
+    // 第一次进入时，选中第一个条目
     function selectFirstItemAuto() {
       onClickCorpItem(corpListRaw.value[0].id)
     }
@@ -249,7 +249,7 @@ export default {
         corpListMap.get(decade).push(element)
       })
     }, 500, false), {
-      immediate: true,
+      // immediate: true,
     })
 
     /**
@@ -374,6 +374,14 @@ export default {
     }
     window.handleClickEnterprise = onClickCorpItem
 
+    onUnmounted(() => {
+      for (let index = 0; index < corpListRaw.value.length; index++) {
+        const element = corpListRaw.value[index]
+        window.gUnityInst.SendMessage('Panel1', 'HideEnterprise', element.id) //隐藏某个企业
+        window.gUnityInst.SendMessage('Panel1', 'HideEnterpriseName', element.id) //隐藏某个企业名称
+      }
+    })
+
     // loading mask相关
     const isShowLoadingMask = ref(true)
     onMounted(() => {
@@ -382,7 +390,7 @@ export default {
       }, 200)
     })
 
-    // 从源宇宙跳到 总览
+    // 从元宇宙跳到 总览
     onMounted(async () => {
       const url = window.location.href
       if (url.includes('id=')) {
@@ -390,7 +398,7 @@ export default {
         // console.log('ppppppppppppppppp', id)
         setTimeout(() => {
           onClickCorpItem(Number(id))
-        }, 1000)
+        }, 500)
       }
     })
 

src/views/Metaverse.vue

@@ -186,6 +186,22 @@ export default {
       isShowDesc.value = true
     }
 
+    function focusStar(idx) {
+      desc.name = rawData.value[idx].name
+      desc.detail = rawData.value[idx].description
+      isShowDesc.value = true
+      window.gUnityInst.SendMessage('Page4', 'OnClickPlaneId', idx + 1)
+    }
+    onMounted(async () => {
+      const url = window.location.href
+      if (url.includes('id=')) {
+        const id = url.split('id=')[1]
+        // console.log('ppppppppppppppppp', id)
+        setTimeout(() => {
+          focusStar(Number(id) - 1)
+        }, 400)
+      }
+    })
 
     // 详情数据
     const G4info = ref({
@@ -207,7 +223,6 @@ export default {
     }
 
     window.handleClickPlanet = function (id) {
-
       G4info.value = {
         company: [],
         person: [],
@@ -221,20 +236,6 @@ export default {
       onClickStar(id - 1)
     }
 
-
-    onMounted(async () => {
-      const url = window.location.href
-      if (url.includes('id=')) {
-        const id = url.split('id=')[1]
-        // console.log('ppppppppppppppppp', id)
-        setTimeout(() => {
-          onClickStar(Number(id) - 1)
-        }, 400)
-      }
-    })
-
-
-
     window.handleMovedPlanet = function (id) {
       console.log('moved planet', id)
     }