tremble 2 lat temu
rodzic
commit
1381dc9441

BIN
SuperTwo762/images/video/濠江战旗别样红_x264.mp4


Plik diff jest za duży
+ 51643 - 51607
SuperTwo762/js/main_2020_show.js


+ 12 - 4
SuperTwo762/js/manage.js

@@ -8,6 +8,15 @@ var Manage = function(){
     
  
 }
+
+let allBgm = document.createElement('video')
+allBgm.src = './music/bgm.mp3'
+allBgm.autoplay = true
+allBgm.loop = true
+allBgm.volume = 0.1
+allBgm.load()
+
+
 //动态加载js文件
 Manage.prototype.LoadJs = function(_files, succes){
 	/* 已加载文件缓存列表,用于判断文件是否已加载过,若已加载则不再次加载*/
@@ -175,7 +184,7 @@ Manage.prototype.ifTourCanPlay = function(){//只有导览在播放时才能继
 
 
 Manage.prototype.switchMusicState = function(state){   //按钮按钮掌管全局音频,导览优先,没有了才放bgm
-    this.musicShouldPlay = state  
+    this.musicShouldPlay = state
     if(state){
         if(! (this.ifTourCanPlay() && player.director.playAudio())){ 
             this.switchBgmState(true) 
@@ -196,10 +205,9 @@ Manage.prototype.switchMusicState = function(state){   //按钮按钮掌管全
 
 
 
-Manage.prototype.switchBgmState = function(state){ 
-    if(!this.musicShouldPlay)return
+Manage.prototype.switchBgmState = function(state){
     if(!g_bgAudio || !g_bgAudio.src) return;
-    //this.currentPlay = 'bgm'
+    this.currentPlay = 'bgm'
     
     var played = function(){ 
         console.log('begin play bgm '+ g_bgAudio.src);

+ 5 - 3
SuperTwo762/js/myShow.js

@@ -2,7 +2,7 @@ var g_ProjectName=window.location.pathname.substring(window.location.pathname.in
 // var g_Prefix="http://192.168.0.44:8110/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
 //var g_Prefix=window.location.origin+'/';
-
+var g_Prefix = ''
 
 var isMobile_ = function() {
     var e = navigator.userAgent || navigator.vendor || window.opera;
@@ -10,9 +10,11 @@ var isMobile_ = function() {
 } 
 window.isMobile = isMobile_()
 if(isMobile){
-    var g_Prefix = 'https://ossxiaoan.4dage.com/cms_army_macao_data/'
+     g_Prefix = 'https://ossxiaoan.4dage.com/cms_army_macao_data/'
 }else{
-    var g_Prefix=window.location.origin+'/';
+    // var g_Prefix=window.location.origin+'/';
+     g_Prefix = 'http://192.168.20.245:8110/'
+
 }
 
 

BIN
SuperTwo762/music/0102cp.mp3


BIN
SuperTwo762/music/03cp.mp3


BIN
SuperTwo762/music/04CP.mp3


BIN
SuperTwo762/music/0506CP.mp3


BIN
SuperTwo762/music/07cp.mp3


BIN
SuperTwo762/music/08CP.mp3


BIN
SuperTwo762/music/09cp.mp3


BIN
SuperTwo762/music/10cp.mp3


BIN
SuperTwo762/music/11cp.mp3


BIN
SuperTwo762/music/1213CP.mp3


BIN
SuperTwo762/music/14cp.mp3


BIN
SuperTwo762/music/15cp.mp3


BIN
SuperTwo762/music/16cp.mp3


BIN
SuperTwo762/music/17cp.mp3


BIN
SuperTwo762/music/18cp.mp3


BIN
SuperTwo762/music/19CP.mp3


BIN
SuperTwo762/music/2021cp.mp3


BIN
SuperTwo762/music/22cp.mp3


BIN
SuperTwo762/music/23cp.mp3


BIN
SuperTwo762/music/24cp.mp3


BIN
SuperTwo762/music/bgm.mp3


+ 1 - 1
code/src/pages/index/index.vue

@@ -65,7 +65,7 @@ export default {
     },
     ifrUrl(){
       
-      let tmp = `${temp}/SuperTwo${this.ifr}/?m=${this.ifr+(this.ifr==inKey?'_en':this.lang)}&qust=1`
+      let tmp = `${temp}/SuperTwo${this.ifr}/index.html?m=${this.ifr+(this.ifr==inKey?'_en':this.lang)}&qust=1`
       return tmp
     }
   },

+ 7 - 30
macaoApplets/project.config.json

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -40,37 +41,13 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.17.0",
-  "appid": "wx88c73e2a2de3c87c",
+  "appid": "wxb4c0527aa20a6e9a",
   "projectname": "macaoApplets",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "scripts": {},
-  "staticServerOptions": {
-    "baseURL": "",
-    "servePath": ""
-  },
-  "isGameTourist": false,
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
-  "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "plugin": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": []
-    }
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

+ 8 - 0
macaoApplets/project.private.config.json

@@ -0,0 +1,8 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "macaoApplets",
+  "setting": {
+    "compileHotReLoad": true
+  },
+  "libVersion": "2.29.1"
+}