修复一堆bug

SuperTwo762/css/main.css

@@ -4129,7 +4129,7 @@ a.hasHover:hover, a:active {
 
 .frame .slidee li.thumbImg.active>img, .frame .slidee li.thumbImg.hasHover.active>img:hover {
     opacity: 1;
-    border-color: #00b4ed
+    border-color: #BFAF1E
 }
 
 .scrollbar {

SuperTwo762/css/oldVer/main0.css

@@ -39,7 +39,8 @@ iframe{
 	/* margin: 80px auto; */
 	display: none;
 	z-index: 101;
-	background:  rgba(0,0,0,0.6);
+	background: url(../../images/bigBAC.png) no-repeat center;
+	background-size: cover;
 }
 .popup-content{
 	position: relative;
@@ -153,8 +154,8 @@ iframe{
 	#closepop{
 		width: 50px;
 		height: 50px;
-		bottom:100px ;
 		right: 50%;
+		top: 80vh;
 		transform: translateX(50%);
 	}
 

SuperTwo791/css/main.css

@@ -3792,9 +3792,9 @@ a.hasHover:hover, a:active {
     padding: 0;
     margin-right: 0px;
     float: left;
-    background: rgba(0, 0, 0, 0.2);
+    /* background: rgba(0, 0, 0, 0.2); */
     border-radius: 10px;
-    margin-right: 10px;
+    margin-right: 25px;
 }
 
 #volume>a, #gui-fullscreen>a, #gui-fullscreen-exit>a {
@@ -4026,7 +4026,8 @@ a.hasHover:hover, a:active {
 }
 
 #thumb-container .thumbImg img {
-    height: 97px
+    height: 97px;
+    width: 134px;
 }
 
 .frame-container {
@@ -4128,7 +4129,7 @@ a.hasHover:hover, a:active {
 
 .frame .slidee li.thumbImg.active>img, .frame .slidee li.thumbImg.hasHover.active>img:hover {
     opacity: 1;
-    border-color: #00b4ed
+    border-color: #BFAF1E
 }
 
 .scrollbar {
@@ -4310,7 +4311,7 @@ a.hasHover:hover, a:active {
     }
     .pinBottom.right {
         right: 0;
-        padding-right: 0
+        padding-right: 10px
     }
 }
 
@@ -4343,7 +4344,8 @@ a.hasHover:hover, a:active {
 
 @media only screen and (max-width: 487px), (max-height:487px) {
     #thumb-container .thumbImg img, .frame {
-        height: 77px
+        height: 77px;
+        width: 103%;
     }
     .frame .slidee li, .frame .slidee li .overlay {
         width: 103px
@@ -4358,7 +4360,7 @@ a.hasHover:hover, a:active {
         bottom: 6px
     }
     #gui .pinBottom.open.noScroll {
-        bottom: 93px
+        bottom: 100px
     }
     .pinBottom.open.noScroll.playing {
         bottom: 108px
@@ -6999,7 +7001,7 @@ a.hasHover.tag-link:hover {
         margin-right: 5px;
     }
     .pinBottom.right, .pinBottom.left {
-        bottom: 5px;
+        bottom: 15px;
     }
     .pinBottom.left {
         left: 5px;
@@ -7010,7 +7012,7 @@ a.hasHover.tag-link:hover {
     }
     #play, #pause {
         width: 64px;
-        margin-bottom: 14px;
+        margin-bottom: 14px;    
     }
     #gui-modes-map>div[rel] {
         width: 64px;

SuperTwo791/index.html

@@ -43,7 +43,10 @@
           opacity: 0.9;
             font-size: 12px;
         }
-    
+        #player{
+            background: url('./images/bigBAC.png') no-repeat center;
+            background-size: cover;
+        }
     </style>
 </head>
 
@@ -254,27 +257,28 @@
                             </div> -->
                         <div id="gui-modes-map" class="ui-icon double active">
                             <div data-original-title="导览" id="pullTab" rel="tooltip" title="">
-                                <img class="icon icon-inside" src="images/auto.png" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/auto.png" title="" />
                             </div>
                             <div data-original-title="热点列表" id="hotList" rel="tooltip" title="" style="display: none">
-                                <img class="icon icon-inside" src="images/hotlist.png" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/hotlist.png" title="" />
                             </div>
                             <div data-original-title="全景漫游" id="gui-modes-inside" rel="tooltip" title="" class="">
-                                <img class="icon icon-inside" src="images/inside.png" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/inside.png" title="" />
                             </div>
                             <div data-original-title="迷你模型" id="gui-modes-dollhouse" rel="tooltip" title="" class="">
-                                <img class="icon icon-inside" src="images/dollhouse.png" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/dollhouse.png" title="" />
                             </div>
-                            <div data-original-title="俯视图" id="gui-modes-floorplan" rel="tooltip" title="">
-                                <img class="icon icon-inside" src="images/floor.png" title="navigation icon" />
+                            <div data-original-title="俯视图" id="gui-modes-floorplan" rel="tooltip" title="" style="margin-bottom: 0px;">
+                                <img class="icon icon-inside" src="images/floor.png" title="" />
                             </div>
                             <div data-original-title="VR" id="vr" rel="tooltip" title="" style="display: none;">
-                                <img class="icon icon-inside" src="images/VR.png" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/VR.png" title="" />
                             </div>
                             <div data-original-title="消除外壳" id="gui-remove-face" rel="tooltip" title=""
                                 style="display: none; float: left;">
-                                <img class="icon icon-inside" src="images/face.jpg" title="navigation icon" />
+                                <img class="icon icon-inside" src="images/face.jpg" title="" />
                             </div>
+    
                         </div>
                     </div>
                 </div>
@@ -288,7 +292,7 @@
                         </div>
                         <div id="volume" class="ui-icon wide">
                             <a>
-                                <img src="images/Volume btn_on.png" width="24" height="24">
+                                <img src="images/Volume btn_on.png" >
                             </a>
                         </div>
                         <div id="vr" class="ui-icon wide hidden" style="display: none;">

SuperTwo791/js/main_2020_show.js

@@ -14751,8 +14751,8 @@ window.Modernizr = function(n, e, t) {
 					var i = new x.Scene
 					  , n = new x.AmbientLight(16777215);
 					i.add(n),
-					i.skybox = new W,
-					i.add(i.skybox),
+					// i.skybox = new W,
+					// i.add(i.skybox),
 					i.plane = new x.Mesh(new x.PlaneBufferGeometry(1e5,1e5),new x.RawShaderMaterial({
 						side: x.DoubleSide
 					})),
@@ -24525,12 +24525,15 @@ window.Modernizr = function(n, e, t) {
         ,
         n.prototype.createContext = function(e) {
             try {
-                this.renderer = new r.WebGLRenderer({antialias: !m.isMobile()}),
-                this.renderer.autoClear = !0,
-                this.renderer.setPixelRatio(window.devicePixelRatio ? window.devicePixelRatio : 1),
-                this.renderer.setSize($("#player").width(), $("#player").height(), false),  //改
-                this.emit(a.ContextCreated)
-            } catch (e) {
+                this.renderer = new r.WebGLRenderer({antialias: !m.isMobile(), alpha:true}),//透明
+               this.renderer.autoClear = !0,
+               this.renderer.setPixelRatio(window.devicePixelRatio ? window.devicePixelRatio : 1),
+               this.renderer.setSize($("#player").width(), $("#player").height(), false),  //改
+               
+               this.renderer.setClearColor( 0x000000, 0 ); //透明
+               
+               this.emit(a.ContextCreated)
+           } catch (e) {
                 throw new h("Unable to create a WebGL rendering context")
             }
             u.profiling.enabled && this.overrideTextures(),

ZAJSG/shapan/Build/WebGL.json

@@ -0,0 +1,16 @@
+{
+"companyName": "DefaultCompany",
+"productName": "WebGL",
+"productVersion": "0.1",
+"dataUrl": "WebGL.data.unityweb",
+"wasmCodeUrl": "WebGL.wasm.code.unityweb",
+"wasmFrameworkUrl": "WebGL.wasm.framework.unityweb",
+"graphicsAPI": ["WebGL 2.0","WebGL 1.0"],
+"webglContextAttributes": {"preserveDrawingBuffer": false},
+"splashScreenStyle": "Dark",
+"backgroundColor": "#231F20",
+"cacheControl": {"default": "must-revalidate"},
+"developmentBuild": true,
+"multithreading": false,
+"unityVersion": "2019.3.1f1"
+}

ZAJSG/shapan/Build/config.js

@@ -0,0 +1,10 @@
+let configVideo = {
+  '出营门':5,
+  '民众送花':17,
+  '出境':7,
+  '过关':1,
+  '澳门街道欢迎01':2,
+  '老马送匾':4,
+  '澳门街道欢迎02':8,
+  '龙城大厦附近':5,
+}

ZAJSG/shapan/TemplateData/UnityProgress.js

@@ -0,0 +1,55 @@
+
+function UnityProgress(unityInstance, progress) {
+  if (!unityInstance.Module)
+    return;
+  if (!unityInstance.logo) {
+    unityInstance.logo = document.createElement("div");
+    unityInstance.logo.className = "logo " + unityInstance.Module.splashScreenStyle;
+    unityInstance.container.appendChild(unityInstance.logo);
+  }
+  if (!unityInstance.progress) {    
+    unityInstance.progress = document.createElement("div");
+    unityInstance.progress.className = "progress " + unityInstance.Module.splashScreenStyle;
+    unityInstance.progress.empty = document.createElement("div");
+    unityInstance.progress.empty.className = "empty";
+    unityInstance.progress.appendChild(unityInstance.progress.empty);
+    unityInstance.progress.full = document.createElement("div");
+    unityInstance.progress.full.className = "full";
+    unityInstance.progress.appendChild(unityInstance.progress.full);
+    unityInstance.container.appendChild(unityInstance.progress);
+  }
+  unityInstance.progress.full.style.width = (100 * progress) + "%";
+  unityInstance.progress.empty.style.width = (100 * (1 - progress)) + "%";
+  if (progress == 1){
+    unityInstance.logo.style.display = unityInstance.progress.style.display = "none";
+    initVideo()
+  }
+
+}
+
+function initVideo() {
+    let ele = $('#fixVideo');
+    let arr = Object.keys(configVideo)
+    let current = 0
+    let delay = 2
+
+    setTimeout(() => {
+      ele.show()
+      ele.attr('src',arr[current] + '.mp4') 
+      ele.trigger('play')
+    }, (configVideo[arr[current]]+delay)*1000);
+
+    ele.bind('ended',()=>{
+      ele.hide()
+      if(current>arr.length-1){
+        return
+      }
+      current++
+      setTimeout(() => {
+        ele.show()
+        ele.attr('src',arr[current] + '.mp4') 
+        ele.trigger('play')
+      }, configVideo[arr[current]]*1000);
+    })
+  
+}

ZAJSG/shapan/TemplateData/style.css

@@ -0,0 +1,144 @@
+.webgl-content *,* {
+  border: 0;
+  margin: 0;
+  padding: 0;
+}
+
+html,body,.webgl-content {
+  width: 100%;
+  height: 100%;
+}
+
+body{
+}
+
+.video{
+  position: fixed;
+  z-index: 999;
+  top: 30px;
+  left: 30px;
+}
+#fixVideo{
+  width: 350px;
+  display: none;
+}
+
+.enter{
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  width: 100%;
+  height: 100%;
+}
+
+.enter > span{
+  display: inline-block;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%,-50%);
+  color: #60ffff;
+  min-width: 100px;
+  border: #60ffff 1px solid;
+  z-index: 999;
+}
+
+
+.webgl-content .logo,
+.progress {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  -webkit-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+}
+.webgl-content .logo {
+  background: url("progressLogo.Light.png") no-repeat center / contain;
+  width: 154px;
+  height: 130px;
+}
+.webgl-content .progress {
+  height: 18px;
+  width: 141px;
+  margin-top: 90px;
+}
+.webgl-content .progress .empty {
+  background: url("progressEmpty.Light.png") no-repeat right / cover;
+  float: right;
+  width: 100%;
+  height: 100%;
+  display: inline-block;
+}
+.webgl-content .progress .full {
+  background: url("progressFull.Light.png") no-repeat left / cover;
+  float: left;
+  width: 0%;
+  height: 100%;
+  display: inline-block;
+}
+
+.webgl-content .logo.Dark {
+  background-image: url("progressLogo.Dark.png");
+}
+.webgl-content .progress.Dark .empty {
+  background-image: url("progressEmpty.Dark.png");
+}
+.webgl-content .progress.Dark .full {
+  background-image: url("progressFull.Dark.png");
+}
+
+.webgl-content .footer {
+  margin-top: 5px;
+  height: 38px;
+  line-height: 38px;
+  font-family: Helvetica, Verdana, Arial, sans-serif;
+  font-size: 18px;
+}
+.webgl-content .footer .webgl-logo,
+.title,
+.fullscreen {
+  height: 100%;
+  display: inline-block;
+  background: transparent center no-repeat;
+}
+.webgl-content .footer .webgl-logo {
+  background-image: url("webgl-logo.png");
+  width: 204px;
+  float: left;
+}
+.webgl-content .footer .title {
+  margin-right: 10px;
+  float: right;
+}
+.webgl-content .footer .fullscreen {
+  background-image: url("fullscreen.png");
+  width: 38px;
+  float: right;
+}
+
+.welcome{
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.8);
+}
+
+.welcome span{
+  display: inline-block;
+  position: absolute;
+  text-align: center;
+  line-height: 40px;
+  height: 40px;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%,-50%);
+  width: 100px;
+  background: #d07b0e;
+  color: #fff;
+  border-radius: 20px;
+  padding: 0 30px;
+  cursor: pointer;
+}

ZAJSG/shapan/index.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Unity WebGL Player | WebGL</title>
+    <link rel="shortcut icon" href="TemplateData/favicon.ico">
+    <link rel="stylesheet" href="TemplateData/style.css">
+    <script src="./Build/jquery.min.js"></script>
+    <script src="./Build/config.js"></script>
+    <script src="TemplateData/UnityProgress.js"></script>
+    <script src="Build/UnityLoader.js"></script>
+    <script>
+      if(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i.test(navigator.userAgent)) {
+        window.location.href = './video.html'
+      }
+    </script>
+  </head>
+  <body>
+    <div class="webgl-content">
+      <div class="welcome">
+        <span id="enter">进入沙盘</span>
+      </div>
+      <div class="video">
+        <video id="fixVideo" autoplay src="./出境.mp4"></video>
+      </div>
+      <!-- <div class="enter">
+        <span>点击进入</span>
+      </div> -->
+      <div id="unityContainer" style="width: 100%; height: 100%"></div>
+    </div>
+    <script>
+      let elem = document.querySelector('#enter')
+      var unityInstance = ''
+      elem.addEventListener('click',function () {
+        unityInstance = UnityLoader.instantiate("unityContainer", "Build/WebGL.json", {onProgress: UnityProgress});
+        let ele = document.querySelector('.welcome')
+        ele.style.display = 'none'
+      })
+      // var unityInstance = UnityLoader.instantiate("unityContainer", "Build/WebGL.json", {onProgress: UnityProgress});
+    </script>
+  </body>
+  
+</html>

ZAJSG/shapan/video.html

@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta content="yes" name="apple-mobile-web-app-capable" />  
+  <meta name="viewport" content="width=device-width,height=device-height,inital-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+  <title>沙盘播放</title>
+</head>
+<link rel="stylesheet" href="./TemplateData/style.css">
+
+
+<style>
+  #initVideo{
+    position: fixed;
+    width: 100%;
+    transform: translate(-50%,-50%);
+    left: 50%;
+    top: 50%;
+    display: inline-block;
+  }
+  .tips{
+    display: none;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 111111;
+    background: rgba(0, 0, 0, 0.5);
+  }
+  .tips > span{
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    display: inline-block;
+    transform: translate(-50%,-50%);
+    background: #fff;
+    border-radius: 20px;
+    padding: 14px 26px;
+  }
+/*横屏*/
+@media (orientation:landscape) {
+  body{
+    background-color: #000;
+  }
+  #initVideo{
+    width: auto;
+    height: 100%;
+  }
+  .tips{
+    display: block;
+    animation:showMask 10s forwards;
+  }
+ }
+
+/*竖屏*/
+@media (orientation:portrait){ }
+
+@keyframes showMask
+{
+  0% {
+    opacity: 1;
+  }
+  80%{
+    opacity: 1;
+  }
+  100% {
+    display: none;
+    opacity: 0;
+    pointer-events: none;
+  }
+}
+</style>
+
+<body>
+  <video id="initVideo" src="./mobile.mp4" x5-video-player-type="h5" x5-video-player-fullscreen="true" webkit-playsinline="" playsinline="" x5-playsinline="" crossorigin="anonymous"> </video>
+  <div class="welcome">
+    <span id="enter">进入沙盘</span>
+  </div>
+
+  <div class="tips">
+    <span>竖屏效果展示更佳</span>
+  </div>
+
+<script>
+  
+  window.initVideo = document.getElementById("initVideo");
+
+  document.addEventListener(
+    'WeixinJSBridgeReady',
+    function() {
+      window.initVideo.play();
+    },
+    false
+    );
+  // window.initVideo.play();
+  let elem = document.querySelector('#enter')
+  elem.addEventListener('click',function () {
+    let ele = document.querySelector('.welcome')
+    ele.style.display = 'none'
+    window.initVideo.play();
+  })
+</script>
+</body>
+</html>
+<script>
+
+</script>

hotspot/src/views/Home.vue

@@ -16,7 +16,7 @@
       :style="{ height: isMobile ? '100%' : '80%' }"
     >
       <div
-        v-if="!isMobile"
+        v-if="!isMobile && videoLength"
         @click="slideto('slidePrev')"
         class="swiper-button-prev"
       >
@@ -53,7 +53,7 @@
         <div class="swiper-pagination" slot="pagination"></div>
       </swiper>
       <div
-        v-if="!isMobile"
+        v-if="!isMobile &&videoLength"
         @click="slideto('slideNext')"
         class="swiper-button-next"
       >
@@ -101,6 +101,7 @@ export default {
   name: "Home",
   data() {
     return {
+      videoLength:true,
       loadAuto: false,
       audio: "",
       m: this.$route.query.m,
@@ -176,7 +177,7 @@ export default {
     },
     async getData() {
       // http://221.4.210.172:10081
-      let url = `/data/${
+      let url = `http://192.168.0.44:8110/data/${
         this.id
       }/hot/js/data.js?time=${Math.random()}`;
       let result = (await this.$http.get(url)).data;
@@ -204,13 +205,20 @@ export default {
       }
     },
     fixUrl(item) {
-      return item;
+      return 'http://192.168.0.44:8110/'+item;
     },
     slideto(action) {
       this.swiper[action]();
     },
   },
   mounted() {
+    // 进页面获取视频个数
+    setTimeout(() => {
+      let videos =document.querySelectorAll('.slide video')
+      console.log(11111,videos.length);
+      if(videos.length===1) this.videoLength = false
+      
+    }, 100);
     this.getData();
     document.addEventListener(
       "WeixinJSBridgeReady",
@@ -309,14 +317,18 @@ export default {
     }
   }
   .intro {
+    position: absolute;
+    top: 80px;
     max-height: 20vh;
     overflow: auto;
-    width: 70%;
+    width: 100%;
     color: #fff;
     margin: 0 auto;
     > h3 {
+      text-align: center;
       font-size: 20px;
       font-weight: 600;
+      color: #d27a11;
     }
     > p {
       line-height: 1.5;
@@ -359,7 +371,11 @@ export default {
 
 @media screen and (max-width: 1000px) {
   .home {
-    background: rgba(0, 0, 0, 0.8);
+    background: url('../assets/images/Mbac.png') no-repeat center;
+    background-size: cover;
+    #audio1{
+      display: block !important;
+    }
     .content {
       .warpper {
         .slide {
@@ -421,6 +437,10 @@ export default {
 </style>
 
 <style>
+.slide {
+  position: absolute;
+  top: 135px;
+}
 .swiper-container {
   width: 100%;
   height: 100%;