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

assets/script/game/component/BtnClosePanel.ts

@@ -28,6 +28,7 @@ export default class BtnClosePanel extends cc.Component {
     }
 
     private async closePanel() {
+        mk.audio.playEffect("button");
         if (this.block_click) return;
         if (this.node_panel) {
             mk.ui.closePanel(this.node_panel.name);

assets/script/game/data/AppData.ts

@@ -4,6 +4,8 @@
  */
 export class AppData {
 
+    public getDeviceInfoCompelete: boolean = false;
+
     /** 错误日志游戏名标志,尽量短 */
     public appNameBugly: string = '3xiao';
 
@@ -21,15 +23,15 @@ export class AppData {
     public appId: string = 'wxcf31f0e54f7fefda';
 
     /** 友盟渠道 */
-    public umengChannel:string = '';
+    public umengChannel: string = '';
 
     /** 设备型号 */
-    public deviceType:string = '';
+    public deviceType: string = '';
 
     /** 安卓版本号 */
-    public androidVersion:string = '';
+    public androidVersion: string = '';
 
-    public mac: string = 'c9:05:e2:1c:b2:23,f6:60:e4:1a:b7:27';
+    public mac: string = 'c9:24:e2:1c:b2:23,f6:60:e4:1a:b7:27';
 
     /** 设备信息 */
     public machineInfo = {
@@ -48,7 +50,6 @@ export class AppData {
      * @param info  info(Java返回)
      */
     public updateDeviceInfo(info) {
-        mk.console.logSingle("updateDeviceInfo",info)
         let arr = info.split('#')
         this.machineInfo.android_id = arr[0];
         this.machineInfo.idfa = arr[1];
@@ -65,6 +66,8 @@ export class AppData {
         this.deviceType = arr[9];
         /** 安卓版本号 */
         this.androidVersion = arr[10];
+
+        this.getDeviceInfoCompelete = true;
     }
 
     public init() {

assets/script/game/data/GameData.ts

@@ -54,27 +54,25 @@ export class GameData {
         this.initConfigs(response.data);
 
         data = {};
-        response = await mk.http.sendData('user/adShowConfig', data);
-        if (response.errcode != 0) {
-            return;
-        }
-        this.adShowConfig = response.data;
-        mk.console.logSingle("user/adShowConfig", response.data);
-
-        data = {};
         response = await mk.http.sendData('getInfoCrypt', data);
         if (response.errcode != 0) {
             return;
         }
         mk.console.logSingle("getInfoCrypt", response.data);
         this.initPlayerProp(response.data)
-
-
         this.initProps(response.data.gameUserData);
-
         gData.moduleData.forEach(element => {
             element.init();
         });
+
+        data = {};
+        response = await mk.http.sendData('user/adShowConfig', data);
+        if (response.errcode != 0) {
+            return;
+        }
+        this.adShowConfig = response.data;
+        mk.console.logSingle("user/adShowConfig", response.data);
+
         this.dataFinish = true;
     }
 

assets/script/game/data/LoginData.ts

@@ -6,7 +6,7 @@ import { StorageKey } from "./StorageData";
  */
 export class LoginData {
 
-    public loadResCompelete: boolean = false;
+    public loadResCompelete: boolean = false;   
 
     /** 是否登录 */
     public isLogin: boolean = false;
@@ -51,7 +51,6 @@ export class LoginData {
      * 登录流程 initApp-->initAd-->connect-->wxLogin-->checkLogin-->getAccountInfo
      */
     public async login() {
-        this.isLogin = true;
         mk.pool.init(gData.gameData.pools);
         gData.appData.init();
         gData.adData.init();
@@ -95,7 +94,7 @@ export class LoginData {
             };
         }
         else {//游客登录
-            encode = mk.encrypt.encrypt(JSON.stringify({ "code": gData.wechatData.code }), ranKey, gData.appData.appId);
+            encode = mk.encrypt.encrypt(JSON.stringify({ "code": '' }), ranKey, gData.appData.appId);
             data = {
                 "uin": this.tempUin,
                 "encrypt": encode

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -235,6 +235,7 @@ export default class BlessingBag extends cc.Component {
 
 
     Click_AdProgressBtn() {
+        mk.audio.playEffect("button");
         if (gData.blessingBag.videoRbData.needToWatchTheVideo != 1) {
             //免费加进度
             gData.blessingBag.HttpNoAdProgress();
@@ -281,6 +282,7 @@ export default class BlessingBag extends cc.Component {
 
     async Click_CashBtn() {
         console.log("--->You Click CashBtn");
+        mk.audio.playEffect("button");
 
         if (gData.blessingBag.videoRbData.cumulativeAmount >= gData.blessingBag.videoRbData.requestAmount) {
             let response = await gData.blessingBag.HttpCashBig();
@@ -298,6 +300,7 @@ export default class BlessingBag extends cc.Component {
     canOpen: boolean = true;
     /**红包界面开按钮*/
     async Click_CashOpenBtn() {
+        mk.audio.playEffect("button");
         if (!this.canOpen) return;
         this.canOpen = false;
         if (this.rbPanelType == 1) {
@@ -328,6 +331,7 @@ export default class BlessingBag extends cc.Component {
     }
 
     Click_InitData() {
+        mk.audio.playEffect("button");
         gData.blessingBag.HttpInitAdRbData();
     }
 

assets/script/game/module/blessingBag/BlessingBagItem.ts

@@ -145,16 +145,19 @@ export default class BlessingBagItem extends cc.Component{
 
 
     Click_CashedBtn() {
+        mk.audio.playEffect("button");
         console.log("clicked cashed");
         mk.tip.pop('该红包已提现');
     }
 
     Click_CanCashBtn() {
+        mk.audio.playEffect("button");
         console.log("clicked canCash");
         gData.blessingBag.OpenTaskRbPanel(this.data.redMoney, this.data.redMoneyId, 2, this.data.redMoney);
     }
 
     Click_NoFinishBtn() {
+        mk.audio.playEffect("button");
         console.log("clicked noFinish");
         mk.tip.pop('提现进度不足');
     }

assets/script/game/module/help/Help.ts

@@ -11,6 +11,10 @@ export default class Help extends cc.Component {
     @property({ type: cc.Label, displayName: '文字说明' })
     lbl_desc: cc.Label = null;
 
+    start(){
+        mk.audio.playEffect("button");
+    }
+
     update() {
         if (gData.help.init_desc_name) {
             this.lbl_desc.string = gData.help.des;

assets/script/game/module/login/Login.ts

@@ -1,3 +1,5 @@
+
+import JsbSystem from "../../../mk/system/JsbSystem";
 import LoadingBar from "../../component/LoadingBar";
 
 const { ccclass, property } = cc._decorator;
@@ -19,6 +21,7 @@ export default class Login extends cc.Component {
     }
 
     start() {
+        JsbSystem.getDeviceInfo();
     }
 
     private setProgress(current) {
@@ -32,16 +35,19 @@ export default class Login extends cc.Component {
             this.process += 2;
             this.setProgress(this.process);
         }
-        if (!gData.loginData.loadResCompelete) {
-            gData.loginData.loadLocalRes();
-            return;
-        }
-        if (!gData.loginData.isLogin) {
-            gData.loginData.login();
-            return;
+        if (gData.loginData.loadResCompelete) {
+            if (gData.appData.getDeviceInfoCompelete) {
+                gData.loginData.login();
+                gData.appData.getDeviceInfoCompelete = false;
+            }
+            else if (gData.gameData.dataFinish) {//登录流程完毕
+                mk.ui.openPanel("game/prefab/game");
+                gData.gameData.dataFinish = false;
+            }
         }
-        if (gData.gameData.dataFinish) {//登录流程完毕
-            mk.ui.openPanel("game/prefab/game");
+        else {
+            gData.loginData.loadLocalRes();
         }
+
     }
 }

assets/script/game/module/pigBank/PigBank.ts

@@ -73,6 +73,7 @@ export default class PigBank extends cc.Component {
      * 提现操作
      */
     private clickCashOP() {
+        mk.audio.playEffect("button");
         if (!gData.pigbank.cash_enable) return;
         gData.pigbank.cashOP();
         mk.ui.closePanel(this.node.name);

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

@@ -44,12 +44,14 @@ export default class Setting extends cc.Component {
     }
 
     clickCopy() {
+        mk.audio.playEffect("button");
         JsbSystem.setClipboard(gData.wechatData.unionid);
         mk.tip.pop("复制成功");
     }
 
     async clickMusic() {
         mk.audio.switchMusicFunc();
+        mk.audio.playEffect("button");
 
         let music = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
         this.img_music.spriteFrame = await mk.loader.load(music, cc.SpriteFrame);
@@ -57,6 +59,7 @@ export default class Setting extends cc.Component {
 
     async clickEffect() {
         mk.audio.switchEffectFunc();
+        mk.audio.playEffect("button");
 
         let effect = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");
         this.img_effect.spriteFrame = await mk.loader.load(effect, cc.SpriteFrame);

assets/script/game/module/sign/Sign.ts

@@ -64,6 +64,7 @@ export default class Sign extends cc.Component {
      * 点击领取按钮
      */
     private clickReceiveReward() {
+        mk.audio.playEffect("button");
         if (!gData.sign.sign_can) return;
         if (!gData.sign.haveSignDay()) return;
 

assets/script/game/module/turntable/Turnable.ts

@@ -64,12 +64,12 @@ export default class Turnable extends cc.Component {
         this.audioId = await mk.audio.playEffect("turnableplay", true);
         this.btn_close.getComponent(BtnClosePanel).block_click = true;
 
-        this.perAdd = 10
-        this.node_turn.angle += 360 * 5
-        this.endAngle = index * -60
-        this.slowAngle = this.endAngle + this.slowDis
-        this.perMinus = this.perAdd / (this.slowDis / (this.perAdd * 0.5))
-        this.startDraw = true
+        this.perAdd = 10;
+        this.node_turn.angle += 360 * 5;
+        this.endAngle = index * -60;
+        this.slowAngle = this.endAngle + this.slowDis;
+        this.perMinus = this.perAdd / (this.slowDis / (this.perAdd * 0.5));
+        this.startDraw = true;
 
         // this.node_turn.angle = 1800;
         // let tar = index * 60;
@@ -101,19 +101,19 @@ export default class Turnable extends cc.Component {
         }
 
         if (this.startDraw) {
-            this.node_turn.angle -= this.perAdd
+            this.node_turn.angle -= this.perAdd;
             //开始减速
             if (this.node_turn.angle <= this.slowAngle) {
                 if (this.perAdd <= this.perMinus * 4) {
-                    this.perAdd -= this.perMinus * 0.01
+                    this.perAdd -= this.perMinus * 0.01;
                 }
                 else {
-                    this.perAdd -= this.perMinus
+                    this.perAdd -= this.perMinus;
                 }
             }
 
             if (this.node_turn.angle <= this.endAngle) {
-                this.startDraw = false
+                this.startDraw = false;
             }
         }
     }

assets/script/mk/system/JsbSystem.ts

@@ -58,6 +58,7 @@ export default class JsbSystem {
      * @param info  info(Java返回)
      */
     public static updateDeviceInfo(info) {
+        mk.console.log("updateDeviceInfo" + cc.sys.os, info)
         if (cc.sys.os == cc.sys.OS_ANDROID) {
             gData.appData.updateDeviceInfo(info);
         }
@@ -71,12 +72,16 @@ export default class JsbSystem {
      * @description 自定义功能 CocosToJava
      */
     public static getDeviceInfo() {
+        mk.console.log("getDeviceInfo", cc.sys.os)
         if (cc.sys.os == cc.sys.OS_ANDROID) {
             this.callStaticMethod(this._JSB_ANDROID_PATH, "getDeviceInfo", "()V");
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {
             this.callStaticMethod(this._JSB_IOS_PATH, "getDeviceInfo", "");
         }
+        else {
+            gData.appData.getDeviceInfoCompelete = true;
+        }
     }
 
     /**