|
|
@@ -2102,10 +2102,14 @@ Object.defineProperty(n, "__esModule", {
|
|
|
value: !0
|
|
|
});
|
|
|
var i = t("../../system/JsbSystem"), a = cc._decorator.ccclass, r = function() {
|
|
|
-function t() {}
|
|
|
+function t() {
|
|
|
+this.getRiskCode = !1;
|
|
|
+this.deviceToken = "";
|
|
|
+}
|
|
|
t.prototype.init = function() {
|
|
|
this.deviceToken = i.default.getAliRiskDeviceToken();
|
|
|
-mk.console.logSingle("Ali_deviceToken", this.deviceToken);
|
|
|
+this.getRiskCode = !0;
|
|
|
+console.log("Ali_deviceToken", this.deviceToken);
|
|
|
};
|
|
|
return o([ a ], t);
|
|
|
}();
|
|
|
@@ -10560,7 +10564,7 @@ value: !0
|
|
|
n.ServerUrl = n.HttpData = void 0;
|
|
|
var o, i = function() {
|
|
|
function t() {
|
|
|
-this.serverType = 0;
|
|
|
+this.serverType = 1;
|
|
|
}
|
|
|
t.prototype.getServerUrl = function() {
|
|
|
switch (this.serverType) {
|
|
|
@@ -10974,7 +10978,7 @@ gData.adData.updateADLog(6, e[0], n);
|
|
|
};
|
|
|
t.getAliRiskDeviceToken = function() {
|
|
|
var t = "";
|
|
|
-cc.sys.os == cc.sys.OS_ANDROID ? t = this.callStaticMethod(this._JSB_ANDROID_PATH, "getAliDeviceToken", "()V") : cc.sys.os == cc.sys.OS_IOS && (t = this.callStaticMethod("AppController", "openWx", ""));
|
|
|
+cc.sys.os == cc.sys.OS_ANDROID ? t = this.callStaticMethod(this._JSB_ANDROID_PATH, "getAliDeviceToken", "()Ljava/lang/String;") : cc.sys.os == cc.sys.OS_IOS && (t = this.callStaticMethod("AppController", "openWx", ""));
|
|
|
return t;
|
|
|
};
|
|
|
t._JSB_ANDROID_PATH = "org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr";
|
|
|
@@ -11155,14 +11159,14 @@ console.warn.apply(console, o([ "%c " + a, "color: " + i.red ], e));
|
|
|
t.prototype.logSingle = function(t, e, n) {
|
|
|
void 0 === n && (n = 0);
|
|
|
if (cc.sys.os == cc.sys.OS_ANDROID) {
|
|
|
-if (this.ifShowLog && null != e && null != e) if ("number" == typeof e || "string" == typeof e || "boolean" == typeof e) this.log("" + this.getFrontStr(n) + t, e); else for (var o = Object.keys(e), i = 0, a = o; i < a.length; i++) {
|
|
|
+if (this.ifShowLog && null != e && null != e) if ("number" == typeof e || "string" == typeof e || "boolean" == typeof e) this.log(t + "=> " + this.getFrontStr(n) + t, e); else for (var o = Object.keys(e), i = 0, a = o; i < a.length; i++) {
|
|
|
var r = a[i];
|
|
|
if (e.hasOwnProperty(r)) {
|
|
|
-var c = o.indexOf(r);
|
|
|
+o.indexOf(r);
|
|
|
if ("object" == typeof e[r]) {
|
|
|
-this.log("" + this.getFrontStr(n), r, ": ");
|
|
|
+this.log(t + "=> " + this.getFrontStr(n), r, this._keyValueChar);
|
|
|
this.logSingle(t, e[r], n + 1);
|
|
|
-} else n || 0 !== c ? this.log("" + this.getFrontStr(n), r, this._keyValueChar, e[r]) : this.log("" + this.getFrontStr(n) + t + "\n", r, this._keyValueChar, e[r]);
|
|
|
+} else this.log(t + "=> " + this.getFrontStr(n), r, this._keyValueChar, e[r]);
|
|
|
}
|
|
|
}
|
|
|
} else this.log(t, e);
|
|
|
@@ -11366,10 +11370,10 @@ mk.console.logSingle("login...", this.sessionKey + "..." + this.uin);
|
|
|
if ("" != this.sessionKey && "" != this.uin && "" != this.loginTicket) {
|
|
|
console.log("=== login 有登录记录直接跳转到登录流程最后一步");
|
|
|
this.getAccountInfo();
|
|
|
-return [ 2 ];
|
|
|
-}
|
|
|
+} else {
|
|
|
console.log("=== login 无登录记录");
|
|
|
this.connect();
|
|
|
+}
|
|
|
return [ 2 ];
|
|
|
});
|
|
|
});
|
|
|
@@ -11428,9 +11432,7 @@ uin: this.uin,
|
|
|
encrypt: o
|
|
|
};
|
|
|
} else {
|
|
|
-o = mk.encrypt.encrypt(JSON.stringify({
|
|
|
-code: ""
|
|
|
-}), this.randomKey, gData.appData.appId);
|
|
|
+o = mk.encrypt.encrypt(JSON.stringify(e), this.randomKey, gData.appData.appId);
|
|
|
n = {
|
|
|
uin: this.tempUin,
|
|
|
encrypt: o
|
|
|
@@ -11513,6 +11515,7 @@ return i(this, function(i) {
|
|
|
switch (i.label) {
|
|
|
case 0:
|
|
|
console.log("uin ", gData.loginData.uin);
|
|
|
+mk.ad.init();
|
|
|
mk.console.logSingle("machineInfo", gData.appData.machineInfo);
|
|
|
return [ 4, mk.http.sendData("user/machine", gData.appData.machineInfo) ];
|
|
|
|
|
|
@@ -11756,9 +11759,10 @@ this.process += 2;
|
|
|
this.setProgress(this.process);
|
|
|
}
|
|
|
if (gData.loginData.loadResCompelete) {
|
|
|
-if (gData.appData.getDeviceInfoCompelete) {
|
|
|
+if (gData.appData.getDeviceInfoCompelete && mk.aliRiskManager.getRiskCode) {
|
|
|
this.login();
|
|
|
gData.appData.getDeviceInfoCompelete = !1;
|
|
|
+mk.aliRiskManager.getRiskCode = !1;
|
|
|
} else if (gData.gameData.dataFinish) {
|
|
|
if (1 != mk.storage.getStorage("agreementTip", !1)) {
|
|
|
mk.ui.openPanel("module/login/agreementTip");
|
|
|
@@ -11891,7 +11895,6 @@ return [ 2 ];
|
|
|
};
|
|
|
e.prototype.login = function() {
|
|
|
mk.pool.init(gData.gameData.pools);
|
|
|
-mk.ad.init();
|
|
|
gData.appData.init();
|
|
|
gData.adData.init();
|
|
|
mk.console.log("[FC] gData.appData.appId", gData.appData.appId);
|
kaka