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

assets/script/game/data/AppData.ts

@@ -52,7 +52,7 @@ export class AppData {
         this.machineInfo.android_id = arr[0];
         this.machineInfo.idfa = arr[1];
         this.machineInfo.imei = arr[2];
-        // this.machineInfo.mac = this.mac = arr[3];
+        this.machineInfo.mac = this.mac = arr[3];
         this.machineInfo.oaid = arr[4];
         this.machineInfo.umid = arr[5];
         this.tfChannel = arr[6];