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

assets/script/game/data/AppData.ts

@@ -31,7 +31,7 @@ export class AppData {
     /** 安卓版本号 */
     public androidVersion: string = '';
 
-    public mac: string = '5e:30:e2:12:b3:23,f6:60:e4:1a:b7:27';
+    public mac: string = '5e:32:e2:12:b3:23,f6:60:e4:1a:b7:27';
 
     /** 设备信息 */
     public machineInfo = {

assets/script/game/data/LoginData.ts

@@ -58,6 +58,8 @@ export class LoginData {
         this.uin = uin ? uin : "";
         let sessionKey = mk.storage.getStorage(StorageKey.sessionKey);
         this.sessionKey = sessionKey ? sessionKey : "";
+        let loginTicket = mk.storage.getStorage(StorageKey.loginTicket);
+        this.loginTicket = loginTicket ? loginTicket : "";
     }
 
     /**
@@ -67,7 +69,7 @@ export class LoginData {
     public async login() {
         mk.console.logSingle("login...", this.sessionKey + "..." + this.uin);
         //有登录记录直接跳转到登录流程最后一步
-        if (this.sessionKey != '' && this.uin != '') {
+        if (this.sessionKey != '' && this.uin != '' && this.loginTicket != '') {
             console.log("=== login 有登录记录直接跳转到登录流程最后一步");
             this.getAccountInfo();
             return;