文件上传

assets/script/game/data/AdData.ts

@@ -35,12 +35,12 @@ export class AdData {
     public async updateVideo(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,

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/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/SignIconItem.ts

@@ -61,7 +61,7 @@ export default class SignIconItem extends cc.Component {
         this.icon_data = icon_data;
 
         // 状态样式
-        let state = g.sign.getStateByDay(icon_data.login_day);
+        let state = gData.sign.getStateByDay(icon_data.login_day);
         if (state == GEnum.rewardState.none) {
             this.node_mask.active = true;
             this.node_gou.active = true;

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

@@ -33,13 +33,13 @@ export default class Turnable extends cc.Component {
     }
 
     clickDraw() {
-        if (g.turnable.leftTimes > 0 && !this.isPlaying) {
+        if (gData.turnable.leftTimes > 0 && !this.isPlaying) {
             this.draw();
         }
     }
 
     private draw() {
-        g.turnable.leftTimes--;
+        gData.turnable.leftTimes--;
         this.node_turn.rotation = 1800;
         let index = 2;
         let tar = index * 60;
@@ -51,12 +51,12 @@ 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 (!gData.turnable.dataFinish) {
+            gData.turnable.init();
         }
         else{
             this.initData();

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));
     }