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

assets/resources/module/turnable/texture/hb.png.meta → assets/resources/module/turnable/texture/hb3.png.meta

@@ -11,7 +11,7 @@
   "height": 94,
   "platformSettings": {},
   "subMetas": {
-    "hb": {
+    "hb3": {
       "ver": "1.0.4",
       "uuid": "90285806-551f-49ec-af5b-d8aea2c938b4",
       "rawTextureUuid": "d1138ae1-71d5-4878-9026-8eb8c586d8f4",

assets/script/game/data/AdData.ts

@@ -32,15 +32,15 @@ export class AdData {
     }
 
 
-    public async updateVideo(type: AdFun) {
+    public async watchVideo(type: AdFun) {
         this.ad_subType = type;
         let data = {
-            "imei": g.appData.machineInfo.imei,
-            "idfa": g.appData.machineInfo.idfa,
-            "oaid": g.appData.machineInfo.oaid,
-            "uin": g.loginData.uin,
-            "version": g.appData.appVersion,
-            "tf_channel": g.appData.tfChannel,
+            "imei": gData.appData.machineInfo.imei,
+            "idfa": gData.appData.machineInfo.idfa,
+            "oaid": gData.appData.machineInfo.oaid,
+            "uin": gData.loginData.uin,
+            "version": gData.appData.appVersion,
+            "tf_channel": gData.appData.tfChannel,
             "destoon_ad_place": this.placementId,
             "adunit_format": this.adunit_format,
             "network_type": this.network_type,
@@ -60,19 +60,13 @@ export class AdData {
         if (response.errcode != 0) {
             return;
         }
+        switch(this.ad_subType){
+            case AdFun.bubble:
+
+            break;
+            case AdFun.sign
+        }
         this.data = response.data;
     }
 
 }
-
-/**
- * 看视频类型
- */
-export enum AdFun {
-    bubble = 1,         //气泡视频
-    checkpoint = 2,     //关卡视频
-    settlement = 3,     //关卡结算视频
-    turntable = 4,      //转盘视频
-    sign = 5,           //签到视频
-    bigCash = 6,         //福袋视频
-}

assets/script/game/data/EnumData.ts

@@ -2,15 +2,37 @@
  * 全局枚举数据
  * @author
  */
-export class EnumData {
-
+enum rewardState {
+    /** 已领取 */
+    none = 1,
+    /** 未解锁 */
+    lock = 2,
+    /** 可领取 */
+    unlock = 3
+}
+export class GEnum {
     /** 奖励状态 */
-    rewardState = {
-        /** 已领取 */
-        none: 1,
-        /** 未解锁 */
-        lock: 2,
-        /** 可领取 */
-        unlock: 3
+    rewardState = rewardState;
+    GameProp = {
+        /** ------------------ 游戏核心数据 --------------------------- */
+
+
+        /** ------------------ 转盘数据 ------------------------------ */
+        turnable_leftTimes: 20,
+
+
+        /** ------------------ 存钱罐数据 ----------------------------- */
+
+
+        /** ------------------ 签到数据 ----------------------------- */
+        /** 上次签到进度 */
+        sign_last_bar: 120,
+        /** 当前能否签到 */
+        sign_can: 121,
     }
 }
+
+declare global {
+    const GEnum: GEnum;
+}
+window['GEnum'] = new GEnum();

assets/script/game/data/g.ts → assets/script/game/data/GData.ts

@@ -15,14 +15,13 @@ import { FissionData } from "./module/FissionData";
 import { LuckyBagData } from "./module/LuckyBagData";
 import { CashNormalData } from "./module/CashNormalData";
 import { CashPigData } from "./module/CashPigData";
-import { EnumData } from "./EnumData";
 
 /**
  * 数据集合全局类
  * @description 所有数据都通过这个类创建，修改，删除
  * @author 邹勇
  */
-class g {
+class GData {
     constructor() {
         this.init();
     }
@@ -33,7 +32,6 @@ class g {
     public wechatData: WechatData;
     public httpData: HttpData;
     public adData: AdData;
-    public enum: EnumData;
     public storageData: StorageData;
 
     //module
@@ -54,7 +52,6 @@ class g {
         this.wechatData = new WechatData();
         this.httpData = new HttpData();
         this.adData = new AdData();
-        this.enum = new EnumData();
         this.storageData = new StorageData();
 
         this.help = new HelpData();
@@ -85,9 +82,9 @@ export enum Fun {
 }
 
 declare global {
-    const g: g;
+    const gData: GData;
 }
-window['g'] = new g();
+window['gData'] = new GData();
 
 
 

assets/script/game/data/GameData.ts

@@ -24,7 +24,7 @@ export class GameData {
      * @returns 
      */
     public async init() {
-        let data: any = { "versionCode": g.appData.version };
+        let data: any = { "versionCode": gData.appData.version };
         let response = await mk.http.sendData('getAllConfigInfo', data);
         if (response.errcode != 0) {
             return;

assets/script/game/data/LoginData.ts

@@ -44,8 +44,8 @@ export class LoginData {
      */
     public async login() {
         this.isLogin = true;
-        g.appData.init();
-        g.adData.init();
+        gData.appData.init();
+        gData.adData.init();
 
         //有登录记录直接跳转到登录流程最后一步
         if (this.sessionKey != '' && this.uin != '') {
@@ -55,9 +55,9 @@ export class LoginData {
 
         let ranKey = mk.encrypt.randomString();
         let data: any = {
-            "mac": g.appData.mac,
+            "mac": gData.appData.mac,
             "psk": ranKey,
-            "appId": g.appData.appId
+            "appId": gData.appData.appId
         }
 
         //connect
@@ -65,20 +65,20 @@ export class LoginData {
         if (response.errcode != 0) {
             return;
         }
-        data = mk.encrypt.decrypt(response.encrypt, ranKey, g.appData.appId);
+        data = mk.encrypt.decrypt(response.encrypt, ranKey, gData.appData.appId);
         this.tempUin = JSON.parse(data).tmp_uin;
 
         //wxLogin
         let encode;
-        if (g.wechatData.code != null) {//微信登录
-            encode = mk.encrypt.encrypt(JSON.stringify({ "code": g.wechatData.code }), this.sessionKey, g.appData.appId);
+        if (gData.wechatData.code != null) {//微信登录
+            encode = mk.encrypt.encrypt(JSON.stringify({ "code": gData.wechatData.code }), this.sessionKey, gData.appData.appId);
             data = {
                 "uin": this.uin,
                 "encrypt": encode
             };
         }
         else {//游客登录
-            encode = mk.encrypt.encrypt(JSON.stringify({ "code": g.wechatData.code }), ranKey, g.appData.appId);
+            encode = mk.encrypt.encrypt(JSON.stringify({ "code": gData.wechatData.code }), ranKey, gData.appData.appId);
             data = {
                 "uin": this.tempUin,
                 "encrypt": encode
@@ -88,11 +88,11 @@ export class LoginData {
         if (response.errcode != 0) {
             return;
         }
-        if (g.wechatData.code != null) {
-            data = mk.encrypt.decrypt(response.encrypt, this.sessionKey, g.appData.appId);
+        if (gData.wechatData.code != null) {
+            data = mk.encrypt.decrypt(response.encrypt, this.sessionKey, gData.appData.appId);
         }
         else {
-            data = mk.encrypt.decrypt(response.encrypt, ranKey, g.appData.appId);
+            data = mk.encrypt.decrypt(response.encrypt, ranKey, gData.appData.appId);
         }
         data = JSON.parse(data);
         this.loginTicket = data.login_ticket;
@@ -115,7 +115,7 @@ export class LoginData {
 
         //checkLogin
         let tmp_key = '';
-        if (g.wechatData.code != null) {
+        if (gData.wechatData.code != null) {
             tmp_key = this.sessionKey;
         }
         else {
@@ -126,17 +126,17 @@ export class LoginData {
             "tmp_key": tmp_key,
             "uin": this.uin,
             "login_ticket": this.loginTicket,
-            "appId": g.appData.appId
+            "appId": gData.appData.appId
         }
         response = await mk.http.sendRequest('checklogin', 'POST', JSON.stringify(data));
         if (response.errcode != 0) {
             return;
         }
-        if (g.wechatData.code != null) {
-            data = mk.encrypt.decrypt(response.encrypt, this.sessionKey, g.appData.appId);
+        if (gData.wechatData.code != null) {
+            data = mk.encrypt.decrypt(response.encrypt, this.sessionKey, gData.appData.appId);
         }
         else {
-            data = mk.encrypt.decrypt(response.encrypt, tmp_key, g.appData.appId);
+            data = mk.encrypt.decrypt(response.encrypt, tmp_key, gData.appData.appId);
         }
 
         data = JSON.parse(data);
@@ -144,13 +144,13 @@ export class LoginData {
 
         mk.storage.setStorage('sessionKey', this.sessionKey);
 
-        if (g.wechatData.code != null) {
+        if (gData.wechatData.code != null) {
             if (this.isNew) {//玩过此游戏并且本地数据是本机的
                 this.getAccountInfo();
             }
             else {//玩过此游戏 但 本地数据不是本账户的 清空数据 重新登录游戏
                 this.isNew = false;
-                g.wechatData.code = null;
+                gData.wechatData.code = null;
                 this.reload();
             }
         }
@@ -162,7 +162,7 @@ export class LoginData {
     private async getAccountInfo() {
         let nickname = mk.storage.getStorage(StorageKey.nickname);
         if (nickname) {
-            g.wechatData.nickName = nickname;
+            gData.wechatData.nickName = nickname;
         }
         else {
             let aa = {
@@ -172,7 +172,7 @@ export class LoginData {
 
             let data: any = {
                 "uin": this.uin,
-                "encrypt": mk.encrypt.encrypt(JSON.stringify(aa), this.sessionKey, g.appData.appId)
+                "encrypt": mk.encrypt.encrypt(JSON.stringify(aa), this.sessionKey, gData.appData.appId)
             };
 
             let response = await mk.http.sendRequest('user', 'POST', JSON.stringify(data), false, false);
@@ -183,16 +183,16 @@ export class LoginData {
             data = response.data;
             this.isAuth = data.is_auth;
             if (this.isAuth) {
-                g.wechatData.nickName = data.nickname;
-                g.wechatData.avatar = data.headimgurl;
+                gData.wechatData.nickName = data.nickname;
+                gData.wechatData.avatar = data.headimgurl;
                 mk.storage.setStorage(StorageKey.isAuth, 1);
-                mk.storage.setStorage(StorageKey.nickname, g.wechatData.nickName, false);
-                mk.storage.setStorage(StorageKey.avatar, g.wechatData.avatar, false);
+                mk.storage.setStorage(StorageKey.nickname, gData.wechatData.nickName, false);
+                mk.storage.setStorage(StorageKey.avatar, gData.wechatData.avatar, false);
             }
         }
 
         //获取游戏数据
-        g.gameData.init();
+        gData.gameData.init();
     }
 
 

assets/script/game/data/module/SignData.ts

@@ -6,27 +6,27 @@ export class SignData {
     /** 标志位：是否需要刷新数据 */
     public init_data: boolean = false;
 
-    /** 签到配置 */
+    /** 配置数据 签到 */
     public c_sign = [];
 
-    // 假数据 当前签到天数
-    private _cur_sign_day = 3;
-    set cur_sign_day(value: number) {
-        this._cur_sign_day = value;
+    // 服务端数据 上次签到天数
+    private _sign_last_bar = 3;
+    set sign_last_bar(value: number) {
+        this._sign_last_bar = value;
         this.init_data = true;
     }
-    get cur_sign_day(): number {
-        return this._cur_sign_day;
+    get sign_last_bar(): number {
+        return this._sign_last_bar;
     }
 
-    // 假数据 能够签到
-    private _can_sign = 1;
-    set can_sign(value: number) {
-        this._can_sign = value;
+    // 服务端数据 能够签到
+    private _sign_can = 1;
+    set sign_can(value: number) {
+        this._sign_can = value;
         this.init_data = true;
     }
-    get can_sign(): number {
-        return this._can_sign;
+    get sign_can(): number {
+        return this._sign_can;
     }
 
     /** 签到列表数据 */
@@ -62,24 +62,24 @@ export class SignData {
         }
         return c_sign;
     }
-    
+
     /**
      * 获取奖励状态
      * @param login_day 登陆日 
      * @returns 状态123
      */
     public getStateByDay(login_day: number) {
-        let _state = g.enum.rewardState.none;
-        if (login_day < this.cur_sign_day) {
-            _state = g.enum.rewardState.none;
-        } else if (login_day == this.cur_sign_day) {
-            if (!this.can_sign) {
-                _state = g.enum.rewardState.none;
+        let _state = GEnum.rewardState.none;
+        if (login_day <= this.sign_last_bar) {
+            _state = GEnum.rewardState.none;
+        } else if (login_day == (this.sign_last_bar + 1)) {
+            if (!this.sign_can) {
+                _state = GEnum.rewardState.none;
             } else {
-                _state = g.enum.rewardState.unlock;
+                _state = GEnum.rewardState.unlock;
             }
         } else {
-            _state = g.enum.rewardState.lock;
+            _state = GEnum.rewardState.lock;
         }
         return _state;
     }

assets/script/game/data/module/TurnableData.ts

@@ -4,21 +4,9 @@
  */
  export class TurnableData{
 
-    /** 请求数据完成 */
-    public dataFinish:boolean = false;
 
     public leftTimes:number = 2;
 
-
-
-    public async init(){
-        let data = {};
-        // let response = await mk.http.sendRequest('turnable', 'POST', JSON.stringify(data));
-        // if (response.errcode != 0) {
-        //     return;
-        // }
-        this.dataFinish = true;
-    }
     
     public async draw(){
         let data = {};

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

@@ -20,12 +20,12 @@ export default class Help extends cc.Component {
     }
 
     update(dt) {
-        if (g.help.init_desc_name) {
+        if (gData.help.init_desc_name) {
             this.initDesc();
-            g.help.init_desc_name = '';
+            gData.help.init_desc_name = '';
         }
     }
     private initDesc() {
-        this.lbl_desc.string = g.help.getDescContent(g.help.init_desc_name);
+        this.lbl_desc.string = gData.help.getDescContent(gData.help.init_desc_name);
     }
 }

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

@@ -17,15 +17,15 @@ export default class Login extends cc.Component {
 
 
     update() {
-        if(!g.loginData.loadResCompelete){
-            g.loginData.loadLocalRes();
+        if(!gData.loginData.loadResCompelete){
+            gData.loginData.loadLocalRes();
             return;
         }
-        if (!g.loginData.isLogin) {
-            g.loginData.login();
+        if (!gData.loginData.isLogin) {
+            gData.loginData.login();
             return;
         }
-        if(g.gameData.dataFinish){//登录流程完毕
+        if(gData.gameData.dataFinish){//登录流程完毕
             mk.ui.openPanel("game",PanelType.game);
         }
     }

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

@@ -25,8 +25,8 @@ export default class PigBank extends cc.Component {
     }
 
     update(dt) {
-        if (g.pigbank.init_data) {
-            g.pigbank.init_data = false;
+        if (gData.pigbank.init_data) {
+            gData.pigbank.init_data = false;
             this.initCashDesc();
         }
     }
@@ -35,15 +35,15 @@ export default class PigBank extends cc.Component {
      * 提现描述展示
      */
     private initCashDesc() {
-        if (g.pigbank.cash_enable) {
+        if (gData.pigbank.cash_enable) {
             this.lbl_get_desc.string = '直接提现';
             this.node_tip_anim.active = false;
             this.anim_btn_cash.play();
         } else {
-            if (g.pigbank.cur_cash_count >= g.pigbank.cash_min_limit) {
+            if (gData.pigbank.cur_cash_count >= gData.pigbank.cash_min_limit) {
                 this.lbl_get_desc.string = '明日可提现';
             } else {
-                this.lbl_get_desc.string = '满' + g.pigbank.cash_min_limit + '元可提';
+                this.lbl_get_desc.string = '满' + gData.pigbank.cash_min_limit + '元可提';
             }
             this.node_tip_anim.active = true;
             this.anim_btn_cash.stop();
@@ -57,7 +57,7 @@ export default class PigBank extends cc.Component {
      * - 精确到分
      */
     private initDeposit() {
-        const new_count = g.pigbank.cur_cash_count.toFixed(2)
+        const new_count = gData.pigbank.cur_cash_count.toFixed(2)
         this.lbl_deposit.string = new_count + '元';
     }
 
@@ -65,7 +65,7 @@ export default class PigBank extends cc.Component {
      * 提现操作
      */
     private clickCashOP() {
-        g.pigbank.cashOP();
+        gData.pigbank.cashOP();
         mk.ui.closePanel(this.node.name);
     }
 
@@ -73,7 +73,7 @@ export default class PigBank extends cc.Component {
      * 打开帮助界面完成回调
      */
     private async clickOpenHelpCall() {
-        g.help.init_desc_name = this.node.name;
+        gData.help.init_desc_name = this.node.name;
     }
 
 

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

@@ -1,5 +1,10 @@
+import { GameProp } from "../../../data/GameData";
+
 /**
  * 签到界面
+ * - 每天第一次上线默认弹出一次【除首日】
+ * - 全部签完后，不可再签到。此处需要判断上次签到天数。
+ * - 签到数据几点刷新？什么方式刷新？ 与后端沟通
  * @author 薛鸿潇
  */
 const { ccclass, property } = cc._decorator;
@@ -17,15 +22,16 @@ export default class Sign extends cc.Component {
     }
 
     start() {
-        g.sign.initListData();
-        g.sign.init_data = true;
+        gData.sign.sign_can = gData.gameData.getProp(GEnum.GameProp.sign_can)
+        gData.sign.initListData();
+        gData.sign.init_data = true;
     }
 
     /**
      * 初始化滚动视图
      */
     private initScollView() {
-        let list_data = g.sign.list_data;
+        let list_data = gData.sign.list_data;
         this.scroll_view.node.emit('srollview-init', list_data)
     }
 
@@ -33,17 +39,22 @@ export default class Sign extends cc.Component {
      * 点击领取按钮
      */
     private clickReceiveReward() {
-        g.sign.can_sign = 0;
+        gData.sign.sign_can = 0;
     }
+
     update(dt) {
-        if (g.sign.init_data) {
-            g.sign.init_data = false;
+        if (gData.sign.init_data) {
+            gData.sign.init_data = false;
             this.initScollView();
             this.initBtnStyle();
         }
     }
+
+    /**
+     * 初始化按钮样式
+     */
     private initBtnStyle() {
-        if (g.sign.can_sign) {
+        if (gData.sign.sign_can) {
             this.anim_btn.play();
             this.anim_btn.getComponent('SetGray').setGray(false);
         } else {

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

@@ -5,7 +5,6 @@ const { ccclass, property } = cc._decorator;
  * @author 薛鸿潇
  * - 红包icon：用红包样式
  * - 现金、金猪现金：用提现样式
- * 签到数据几点刷新？什么方式刷新？ 与后端沟通
  */
 @ccclass
 export default class SignIconItem extends cc.Component {
@@ -30,7 +29,7 @@ export default class SignIconItem extends cc.Component {
         count: 0,
         login_day: 0,
         video_limit: 0,
-        state: g.enum.rewardState.none,
+        state: GEnum.rewardState.none,
     }
 
     /**
@@ -62,15 +61,15 @@ export default class SignIconItem extends cc.Component {
         this.icon_data = icon_data;
 
         // 状态样式
-        let state = g.sign.getStateByDay(icon_data.login_day);
-        if (state == g.enum.rewardState.none) {
+        let state = gData.sign.getStateByDay(icon_data.login_day);
+        if (state == GEnum.rewardState.none) {
             this.node_mask.active = true;
             this.node_gou.active = true;
             this.node_money.active = false;
-        } else if (state == g.enum.rewardState.unlock) {
+        } else if (state == GEnum.rewardState.unlock) {
             this.node_mask.active = false;
             this.node_gou.active = false;
-        } else if (state == g.enum.rewardState.lock) {
+        } else if (state == GEnum.rewardState.lock) {
             this.node_mask.active = false;
             this.node_gou.active = false;
         }

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

@@ -1,3 +1,4 @@
+import { AdFun } from "../../../data/AdData";
 import TurnableItem from "./TurnableItem";
 
 const { ccclass, property } = cc._decorator;
@@ -18,7 +19,7 @@ export default class Turnable extends cc.Component {
     private isPlaying: boolean = false;
 
     onLoad() {
-
+        this.initData();
     }
 
     /**
@@ -32,14 +33,16 @@ export default class Turnable extends cc.Component {
         this.updateLeftTimes();
     }
 
+    /** 点击抽奖 */
     clickDraw() {
-        if (g.turnable.leftTimes > 0 && !this.isPlaying) {
-            this.draw();
+        if (gData.turnable.leftTimes > 0 && !this.isPlaying) {
+            this.isPlaying = true;
+            g.adData.watchVideo(AdFun.turntable);
         }
     }
 
     private draw() {
-        g.turnable.leftTimes--;
+        gData.turnable.leftTimes--;
         this.node_turn.rotation = 1800;
         let index = 2;
         let tar = index * 60;
@@ -51,12 +54,13 @@ export default class Turnable extends cc.Component {
     }
 
     updateLeftTimes(){
-        this.lbl_left.string = `剩余：<color=#FFED99>${g.turnable.leftTimes}</color>次`;
+        this.lbl_left.string = `剩余：<color=#FFED99>${gData.turnable.leftTimes}</color>次`;
     }
 
     update() {
-        if (!g.turnable.dataFinish) {
-            g.turnable.init();
+        if(g.turnable.)
+        if (!gData.turnable.dataFinish) {
+            gData.turnable.init();
         }
         else{
             this.initData();

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

@@ -8,10 +8,9 @@ export default class TurnableItem extends cc.Component {
     lbl_name: cc.Label = null;
 
 
-    public async initData(data) {
-        // let src = data.type;
-        // this.icon.spriteFrame = await mk.loader.load(src, cc.SpriteFrame);
-        this.lbl_name.string = data;
+    public async initData(type) {
+        this.icon.spriteFrame = await mk.loader.load('module/turnable/texture/hb' + type, cc.SpriteFrame);
+        this.lbl_name.string = type == 1 ? "少量红包" : type == 2 ? "中量红包" : "大量红包";
     }
 
 }

assets/script/mk/sdk/BuglySDK.ts

@@ -92,11 +92,11 @@ export default class BuglySDK {
         }
 
         // 拼接服务类型（0测试服 1测试服）和 玩家uin 
-        let uin = g.httpData.serverType + ":" + g.loginData.uin;
+        let uin = gData.httpData.serverType + ":" + gData.loginData.uin;
 
         let senddata = {
             "level": "error",
-            "game": g.appData.appNameBugly + ":" + uin,
+            "game": gData.appData.appNameBugly + ":" + uin,
             "message": d
         };
 

assets/script/mk/system/HttpSystem.ts

@@ -16,12 +16,12 @@ export default class HttpSystem {
         let encode = '';
         let dataN = null;
         data.timestamp = Math.floor(new Date().getTime() / 1000);
-        data.appVersion = g.appData.appVersion;
-        data.tfChannel = g.appData.tfChannel;
-        data.versioncfg = g.appData.version;
-        encode = mk.encrypt.encrypt(JSON.stringify(data), g.loginData.sessionKey, g.appData.appId);
+        data.appVersion = gData.appData.appVersion;
+        data.tfChannel = gData.appData.tfChannel;
+        data.versioncfg = gData.appData.version;
+        encode = mk.encrypt.encrypt(JSON.stringify(data), gData.loginData.sessionKey, gData.appData.appId);
         dataN = {
-            "uin": g.loginData.uin,
+            "uin": gData.loginData.uin,
             "encrypt": encode
         }
         let result = await this.sendRequest(url, 'POST', JSON.stringify(dataN), false, async);
@@ -37,7 +37,7 @@ export default class HttpSystem {
      * @param async 是否异步请求
      */
     public sendRequest(url, method: string = 'POST', data: string = null, isRsa: boolean = true, async = true) {
-        url = g.httpData.getServerUrl() + url;
+        url = gData.httpData.getServerUrl() + url;
         return new Promise<any>((resolve: (data: any) => void, reject) => {
             let requesttimes = 0;
             let httpRequest = new XMLHttpRequest();
@@ -96,7 +96,7 @@ export default class HttpSystem {
         }
         else {
             if (response.encrypt) {
-                data = mk.encrypt.decrypt(response.encrypt, g.loginData.sessionKey, g.appData.appId);
+                data = mk.encrypt.decrypt(response.encrypt, gData.loginData.sessionKey, gData.appData.appId);
                 data = JSON.parse(data);
             }
             else if (response.data) {

assets/script/mk/utils/StorageUtil.ts

@@ -30,7 +30,7 @@ export default class StorageUtil {
      */
     public setStorage(key: string, value: any, encrypt: boolean = true) {
         if (encrypt) {
-            value = mk.encrypt.encrypt(value, g.storageData.storageKey, g.appData.appId);
+            value = mk.encrypt.encrypt(value, gData.storageData.storageKey, gData.appData.appId);
         }
         cc.sys.localStorage.setItem(key, JSON.stringify(value));
     }