xzw 7 달 전
부모
커밋
e17157e4c7
3개의 변경된 파일59개의 추가작업 그리고 8개의 파일을 삭제
  1. 51 0
      scene/package-lock.json
  2. 1 1
      scene/public/static/js/Hot.js
  3. 7 7
      scene/public/static/js/manage.js

+ 51 - 0
scene/package-lock.json

@@ -3394,6 +3394,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "http://192.168.0.47:4873/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -6693,6 +6704,14 @@
         "webpack": "^4.0.0"
       }
     },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "http://192.168.0.47:4873/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/filesize": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
@@ -9483,6 +9502,14 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "node_modules/nan": {
+      "version": "2.22.0",
+      "resolved": "http://192.168.0.47:4873/nan/-/nan-2.22.0.tgz",
+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -19890,6 +19917,16 @@
       "dev": true,
       "optional": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "http://192.168.0.47:4873/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -22668,6 +22705,13 @@
         "schema-utils": "^2.5.0"
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "http://192.168.0.47:4873/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "filesize": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
@@ -24943,6 +24987,13 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "nan": {
+      "version": "2.22.0",
+      "resolved": "http://192.168.0.47:4873/nan/-/nan-2.22.0.tgz",
+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
+      "dev": true,
+      "optional": true
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",

+ 1 - 1
scene/public/static/js/Hot.js

@@ -11,7 +11,7 @@ const playVideoWhenFlyOut = false
 //同时可播放的最大个数:
 const playVideoMax = window.isEdit ? 3  :   browser.isMobile() ? 1 : 3;   
 const playAniMax = window.isEdit ? 6 :   browser.isMobile() ? 3 : 5;
-
+const playSyncGroup = []
 /* const playSyncGroup = [//需要播放同步的视频。  每次都单独定制
    // ['okh1UR466371',  'LGmLHP2615503' ,  'VNyBI6614896'] //中,左,右   场景SHANGJJ
 ] */

+ 7 - 7
scene/public/static/js/manage.js

@@ -16,7 +16,7 @@ var g_HotMeshSize = {
     g_HotMeshWidth: 0.3,
     g_HotMeshHeight:0.3
 };
-var manage
+
 
 
 
@@ -2434,9 +2434,9 @@ function initByTHREE(THREE){
     {
         let f = ()=>{
             window.bus.removeEventListener('playerAndModelReady',f)
+            SoundManager.initAutoPlay()
              
-             
-               
+            CursorDeal.domElements.push($('#player')[0])
              
              
             player.on("mode.changing",(currentMode, mode, pano, duration)=>{ 
@@ -2773,7 +2773,7 @@ var SoundManager = {//暂不支持同时播放
         document.addEventListener("WeixinJSBridgeReady", play, false);
         document.addEventListener("touchstart", play);//ios需要加个事件才能播放 不能自动播放;如果还有浏览器不行,换成别的交互事件
         document.addEventListener("click", play);
-        player.domElement.addEventListener("touchstart", play); 
+        $('#player')[0].addEventListener("touchstart", play); 
             
          
     }
@@ -2864,7 +2864,7 @@ Manage.prototype.loadAudio = function() { //相关:g_tourAudio \  g_playAudio
     })  
     
     this.switchBgmState(true);//初始设置允许播放bgm 
-    SoundManager.initAutoPlay()
+    
     
     
 }  
@@ -2885,7 +2885,7 @@ Manage.prototype.switchBgmState = function(state){//按钮的状态完全代表
     
 }    
 
- manage = new Manage();
+var manage = new Manage();
 
  
  
@@ -2904,7 +2904,7 @@ var CursorDeal = {
         {"addLabel":'cell'},
         {"moveLabel":'grab'},
     ], 
-    domElements :[$('#player')[0]],
+    domElements :[],
     list:[], //当前存在的cursor状态
     currentCursorIndex:null,