xzw hai 10 meses
pai
achega
05d32168e6
Modificáronse 2 ficheiros con 47 adicións e 12 borrados
  1. 11 0
      scene/public/static/js/main_2020_show.js
  2. 36 12
      scene/public/static/js/manage.js

+ 11 - 0
scene/public/static/js/main_2020_show.js

@@ -17776,6 +17776,17 @@ window.Modernizr = function(n, e, t) {
                     })
                 }
                 .bind(this))
+                
+                
+                
+                
+                //xzw add
+                if(player.model.allFloorsVisible){
+                    $('.gui-floor .gui-floor-icon').addClass('inside')
+                }else{
+                    $('.gui-floor .gui-floor-icon').removeClass('inside')
+                } 
+                
             }
             ,
             n.prototype.toggleExplode = function() {

+ 36 - 12
scene/public/static/js/manage.js

@@ -1442,8 +1442,11 @@ function initByTHREE(THREE){
             if(this.floorIndex != void 0){  
                 player.model.on("floor.changed",(currentFloor, mode, oldFloor)=>{
                     this.update(currentFloor)  //注: currentFloor 这时候还没成为 model.currentFloor
+                     
                 })
             }
+            
+            
         }
 
         
@@ -1716,24 +1719,45 @@ function initByTHREE(THREE){
                 }    
                 
             } */
-            if(settings.extractFloor){
+            if(settings.extractFloor){ 
                 let data = settings.extractFloor[number]
                 if(data){ 
-                
-                    let roof = new player.model.floors.list[0].constructor(player.model, player.model.floors.length);//放在第三层 隐藏起来
-                    roof.build()
-                    player.model.floors.add(roof)
+                    setTimeout(()=>{
+                        let roof = new player.model.floors.list[0].constructor(player.model, player.model.floors.length);//放在第三层 隐藏起来
+                        roof.build()
+                        player.model.floors.add(roof)
+                        
+                        for(let i=0;i<data.length;i++){
+                            let chunk = player.model.chunks[data[i]]
+                            let oldFloor = chunk.parent
+                            roof.addChunk(chunk)
+                            let index = oldFloor.chunks.indexOf(chunk)
+                            oldFloor.chunks.splice(index,1)
+                        } 
+                    },10)
                     
-                    for(let i=0;i<data.length;i++){
-                        let chunk = player.model.chunks[data[i]]
-                        let oldFloor = chunk.parent
-                        roof.addChunk(chunk)
-                        let index = oldFloor.chunks.indexOf(chunk)
-                        oldFloor.chunks.splice(index,1)
-                    }
                 } 
                 
             }
+            player.model.on("floor.changed",(currentFloor, mode, oldFloor)=>{
+                this.update(currentFloor)  //注: currentFloor 这时候还没成为 model.currentFloor
+                
+                if(player.model.allFloorsVisible){
+                    $('.gui-floor .gui-floor-icon').addClass('inside')
+                }else{
+                    $('.gui-floor .gui-floor-icon').removeClass('inside')
+                } 
+                
+            })
+            
+            player.on('mode.changed',(e)=>{
+                if(e.mode == 'panorama'){
+                    $('.gui-floor').hide()
+                }else{
+                    $('.gui-floor').show()
+                }
+                
+            })
             
         }