Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/guangdong_museum

web/public/static/css/main.css

@@ -2468,6 +2468,9 @@ body, html {
     width: 100%;
     height: 100%;
     position: absolute;
+    background-image:url('../images/bg.jpg');
+    background-size:auto 100%;
+    background-position:center;
 }
 
 #player canvas {

web/public/static/js/main_2020_show.js

@@ -94,7 +94,7 @@ var updateMenuPos = function(){
 var updateMenuVisi = function(toPano){
      
     menuDiv.visi = toPano && (toPano.id == menuDiv.visiblePano)
-    
+    menuDiv.object
 }
  
  
@@ -14899,8 +14899,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
 					})),
@@ -24649,10 +24649,13 @@ window.Modernizr = function(n, e, t) {
         ,
         n.prototype.createContext = function(e) {
             try {
-                this.renderer = new r.WebGLRenderer({antialias: !m.isMobile()}),
+                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")