Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

# Conflicts:
#	build/jsb-link/assets/main/index.jsc
#	build/jsb-link/assets/resources/config.json
#	build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
#	packages-hot-update/cfg.json

assets/script/game/game/Game.ts

@@ -455,7 +455,7 @@ export default class Game extends cc.Component {
             // gData.gameData.init_add = true;
             gData.gameData.init_red_point = true;
             this.playAdd(exp);
-        })
+        }, 1.2)
     }
 
     public registerCallBack() {

assets/script/game/module/setting/Setting.ts

@@ -82,9 +82,9 @@ export default class Setting extends cc.Component {
     }
 
     async clickMusic() {
-        mk.audio.switchMusicFunc();
         mk.audio.playEffect("button");
-
+        mk.audio.switchMusicFunc();
+    
         let music = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
         this.img_music.spriteFrame = await mk.loader.load(music, cc.SpriteFrame);
     }

assets/script/mk/system/AudioSystem.ts

@@ -33,7 +33,9 @@ export default class AudioSystem {
      */
     public async playMusic(audio_name: AUDIO_NAME, loop: boolean = true) {
         if(!this._switchMusic){
-            return;
+            this.setMusicVolume(0);
+        }else{
+            this.setMusicVolume(1);
         }
         if (!this._bg_audio) {
             this._bg_audio = await mk.loader.load(AUDIO_PATH + audio_name, cc.AudioClip);
@@ -72,7 +74,9 @@ export default class AudioSystem {
     public switchEffectFunc() {
         this._switchEffect = !this._switchEffect;
         if (!this._switchEffect) {
-            this.setStopAllEffect();
+            this.setEffectVolume(0);
+        }else{
+            this.setEffectVolume(1);
         }
         cc.sys.localStorage.setItem("switchEffect", this._switchEffect.toString());
     }
@@ -125,9 +129,9 @@ export default class AudioSystem {
     public switchMusicFunc() {
         this._switchMusic = !this._switchMusic;
         if (!this._switchMusic) {
-            this.setPauseMusic();
+            this.setMusicVolume(0);
         } else {
-            this.setResumeMusic();
+            this.setMusicVolume(1);
         }
         cc.sys.localStorage.setItem("switchMusic", this._switchMusic.toString());
     }

build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -3739,7 +3739,7 @@ var o;
 return a(this, function(n) {
 switch (n.label) {
 case 0:
-if (!this._switchMusic) return [ 2 ];
+this._switchMusic ? this.setMusicVolume(1) : this.setMusicVolume(0);
 if (this._bg_audio) return [ 3, 2 ];
 o = this;
 return [ 4, mk.loader.load(r + t, cc.AudioClip) ];
@@ -3783,7 +3783,7 @@ cc.audioEngine.stopEffect(t);
 };
 t.prototype.switchEffectFunc = function() {
 this._switchEffect = !this._switchEffect;
-this._switchEffect || this.setStopAllEffect();
+this._switchEffect ? this.setEffectVolume(1) : this.setEffectVolume(0);
 cc.sys.localStorage.setItem("switchEffect", this._switchEffect.toString());
 };
 t.prototype.getSwitchEffect = function() {
@@ -3808,7 +3808,7 @@ cc.audioEngine.stopAllEffects();
 };
 t.prototype.switchMusicFunc = function() {
 this._switchMusic = !this._switchMusic;
-this._switchMusic ? this.setResumeMusic() : this.setPauseMusic();
+this._switchMusic ? this.setMusicVolume(1) : this.setMusicVolume(0);
 cc.sys.localStorage.setItem("switchMusic", this._switchMusic.toString());
 };
 t.prototype.getSwitchMusic = function() {
@@ -25577,8 +25577,8 @@ var t, e;
 return c(this, function(o) {
 switch (o.label) {
 case 0:
-mk.audio.switchMusicFunc();
 mk.audio.playEffect("button");
+mk.audio.switchMusicFunc();
 t = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
 e = this.img_music;
 return [ 4, mk.loader.load(t, cc.SpriteFrame) ];