|
@@ -93,6 +93,10 @@ console.log = function (...args) {
|
|
|
splitAndPrintString(combinedString, maxChunkSize);
|
|
|
};
|
|
|
|
|
|
+function systemlog(...args){
|
|
|
+ originalConsoleLog(args);
|
|
|
+}
|
|
|
+
|
|
|
const wsUrl = 'ws://192.168.137.1:9999';
|
|
|
let lws;
|
|
|
let attempt = 1;
|
|
@@ -404,13 +408,13 @@ function dealMsg(msgType,data) {
|
|
|
}
|
|
|
|
|
|
|
|
|
-window.__require = function e(t, n, o) {
|
|
|
- function i(a, s) {
|
|
|
- if (!n[a]) {
|
|
|
- if (!t[a]) {
|
|
|
+window.__require = function e(methodPath, cacheExports, exportKeyArray) {
|
|
|
+ function loadModule(a, s) {
|
|
|
+ if (!cacheExports[a]) {
|
|
|
+ if (!methodPath[a]) {
|
|
|
var c = a.split("/");
|
|
|
c = c[c.length - 1];
|
|
|
- if (!t[c]) {
|
|
|
+ if (!methodPath[c]) {
|
|
|
var l = "function" == typeof __require && __require;
|
|
|
if (!s && l) return l(c, !0);
|
|
|
if (r) return r(c, !0);
|
|
@@ -418,17 +422,17 @@ window.__require = function e(t, n, o) {
|
|
|
}
|
|
|
a = c;
|
|
|
}
|
|
|
- var u = n[a] = {
|
|
|
+ var u = cacheExports[a] = {
|
|
|
exports: {}
|
|
|
};
|
|
|
- t[a][0].call(u.exports, function (e) {
|
|
|
- return i(t[a][1][e] || e);
|
|
|
- }, u, u.exports, e, t, n, o);
|
|
|
+ methodPath[a][0].call(u.exports, function (e) {
|
|
|
+ return loadModule(methodPath[a][1][e] || e);
|
|
|
+ }, u, u.exports, e, methodPath, cacheExports, exportKeyArray);
|
|
|
}
|
|
|
- return n[a].exports;
|
|
|
+ return cacheExports[a].exports;
|
|
|
}
|
|
|
- for (var r = "function" == typeof __require && __require, a = 0; a < o.length; a++) i(o[a]);
|
|
|
- return i;
|
|
|
+ for (var r = "function" == typeof __require && __require, a = 0; a < exportKeyArray.length; a++) loadModule(exportKeyArray[a]);
|
|
|
+ return loadModule;
|
|
|
}({
|
|
|
1: [function (e, t) {
|
|
|
var n = e("util/"), o = Array.prototype.slice, i = Object.prototype.hasOwnProperty, r = t.exports = u;
|
|
@@ -205888,7 +205892,7 @@ window.__require = function e(t, n, o) {
|
|
|
value: !0
|
|
|
});
|
|
|
n.WebSocketState = void 0;
|
|
|
- var o, i = e("./NetworkConfig"), r = e("../common/UI/LoadingManager"), a = e("../common/BJConfig"), s = e("../common/UI/PopupManager"), c = e("../common/SceneManager"), l = e("../common/BJTranslator"), u = e("../common/LangData"), d = e("../common/BJBasicConfig"), p = e("../common/BJDataManager"), h = e("../common/Utils"), f = e("../blackjack/BJDataHolder"), g = e("../common/BJConsoleLog"), m = function () { };
|
|
|
+ var o, _NetworkConfig = e("./NetworkConfig"), r = e("../common/UI/LoadingManager"), a = e("../common/BJConfig"), s = e("../common/UI/PopupManager"), c = e("../common/SceneManager"), l = e("../common/BJTranslator"), u = e("../common/LangData"), d = e("../common/BJBasicConfig"), p = e("../common/BJDataManager"), h = e("../common/Utils"), f = e("../blackjack/BJDataHolder"), g = e("../common/BJConsoleLog"), m = function () { };
|
|
|
(function (e) {
|
|
|
e[e.CLOSED = 0] = "CLOSED";
|
|
|
e[e.CLOSING = 1] = "CLOSING";
|
|
@@ -205956,18 +205960,18 @@ window.__require = function e(t, n, o) {
|
|
|
clearTimeout(n._pingAction);
|
|
|
clearTimeout(n._pongAction);
|
|
|
n._tryPong = 0;
|
|
|
- n._pingAction = setTimeout(n.ping, i.default.PING_TIMEOUT_INTERVAL);
|
|
|
+ n._pingAction = setTimeout(n.ping, _NetworkConfig.default.PING_TIMEOUT_INTERVAL);
|
|
|
};
|
|
|
this.ping = function () {
|
|
|
if (n.ws) {
|
|
|
n.ws.send(n.pingMessageData);
|
|
|
- n._pongAction = setTimeout(n.pong, i.default.PONG_TIMEOUT_INTERVAL);
|
|
|
+ n._pongAction = setTimeout(n.pong, _NetworkConfig.default.PONG_TIMEOUT_INTERVAL);
|
|
|
}
|
|
|
};
|
|
|
this.pong = function () {
|
|
|
n._tryPong++;
|
|
|
g.BJConsoleLog.log("pong try lost", n.url, n._tryPong);
|
|
|
- if (n._tryPong >= i.default.PING_PONG_TRY_TIME) {
|
|
|
+ if (n._tryPong >= _NetworkConfig.default.PING_PONG_TRY_TIME) {
|
|
|
n._tryPong = 0;
|
|
|
g.BJConsoleLog.log("pong lost", n.url);
|
|
|
n.connect();
|
|
@@ -238887,7 +238891,7 @@ window.__require = function e(t, n, o) {
|
|
|
Object.defineProperty(n, "__esModule", {
|
|
|
value: !0
|
|
|
});
|
|
|
- var a = e("./CustomScrollViewItem"), s = cc._decorator, c = s.ccclass, l = s.property, u = function (e) {
|
|
|
+ var a = e("./CustomScrollViewItem"), cc_decorator = cc._decorator, cc_ccclass = cc_decorator.ccclass, cc_property = cc_decorator.property, u = function (e) {
|
|
|
i(t, e);
|
|
|
function t() {
|
|
|
var t = null !== e && e.apply(this, arguments) || this;
|
|
@@ -239014,10 +239018,10 @@ window.__require = function e(t, n, o) {
|
|
|
t.prototype.resetContentPosition = function () {
|
|
|
cc.isValid(this.initPos) && this.content.setPosition(this.initPos);
|
|
|
};
|
|
|
- r([l], t.prototype, "displayBuffer", void 0);
|
|
|
- r([l(cc.Mask)], t.prototype, "view", void 0);
|
|
|
- r([l(cc.Prefab)], t.prototype, "loadPrefab", void 0);
|
|
|
- return r([c], t);
|
|
|
+ r([cc_property], t.prototype, "displayBuffer", void 0);
|
|
|
+ r([cc_property(cc.Mask)], t.prototype, "view", void 0);
|
|
|
+ r([cc_property(cc.Prefab)], t.prototype, "loadPrefab", void 0);
|
|
|
+ return r([cc_ccclass], t);
|
|
|
}(cc.ScrollView);
|
|
|
n.default = u;
|
|
|
cc._RF.pop();
|
|
@@ -288221,33 +288225,33 @@ window.__require = function e(t, n, o) {
|
|
|
});
|
|
|
}
|
|
|
};
|
|
|
- HMFExtension.openPokerMasterGameWithRoomId = function (e, t) {
|
|
|
- if (0 != e) {
|
|
|
+ HMFExtension.openPokerMasterGameWithRoomId = function (roomId, exitWhere) {
|
|
|
+ if (0 != roomId) {
|
|
|
var n = {
|
|
|
- roomId: e,
|
|
|
- exitWhere: t
|
|
|
+ roomId: roomId,
|
|
|
+ exitWhere: exitWhere
|
|
|
};
|
|
|
CurrentUserInfo.littleGameType = "pkm";
|
|
|
CurrentUserInfo.pkmGameParam = n;
|
|
|
cc.vv.loading.show();
|
|
|
- CurrentUserInfo.user.wasUserInDiamondGame ? HMFHTTPClient.pokerMasterGameLogin(e).then(function (n) {
|
|
|
+ CurrentUserInfo.user.wasUserInDiamondGame ? HMFHTTPClient.pokerMasterGameLogin(roomId).then(function (n) {
|
|
|
cc.vv.loading.hide();
|
|
|
console.log(n);
|
|
|
if (0 == n.errorCode) {
|
|
|
- HMFAppSetting.pokerMasterExitWhere = t;
|
|
|
+ HMFAppSetting.pokerMasterExitWhere = exitWhere;
|
|
|
cc.sys.localStorage.setItem("PokerMasterWs", n.data.gate_addr[0]);
|
|
|
cc.sys.localStorage.setItem("PokerMasterToken", n.data.token);
|
|
|
l.worldNet.initCommon(l.Enum.GameId.World);
|
|
|
l.getPokerMasterNet().initCommon(l.Enum.GameId.PokerMaster);
|
|
|
- l.roomManager.RequestJoinRoom(l.Enum.GameId.PokerMaster, e);
|
|
|
+ l.roomManager.RequestJoinRoom(l.Enum.GameId.PokerMaster, roomId);
|
|
|
}
|
|
|
}, function () {
|
|
|
cc.vv.loading.hide();
|
|
|
}) : l.netWorkManager.onWpkSwitchNetConnect(!0, function () {
|
|
|
l.worldNet.initCommon(l.Enum.GameId.World);
|
|
|
- l.roomManager.setCurrentRoomID(e);
|
|
|
+ l.roomManager.setCurrentRoomID(roomId);
|
|
|
l.getPokerMasterNet().initCommon(l.Enum.GameId.PokerMaster);
|
|
|
- l.roomManager.RequestJoinRoom(l.Enum.GameId.PokerMaster, e);
|
|
|
+ l.roomManager.RequestJoinRoom(l.Enum.GameId.PokerMaster, roomId);
|
|
|
});
|
|
|
}
|
|
|
};
|
|
@@ -381898,7 +381902,7 @@ window.__require = function e(t, n, o) {
|
|
|
"../../lobby/cv": "cv",
|
|
|
"./PokerMasterRoomData": "PokerMasterRoomData"
|
|
|
}],
|
|
|
- PokerMasterHallSocket: [function (e, t, n) {
|
|
|
+ PokerMasterHallSocket: [function (loadModule, t, n) {
|
|
|
"use strict";
|
|
|
cc._RF.push(t, "713f3WdnDhJZppOA/4ZX1xA", "PokerMasterHallSocket");
|
|
|
var o, i = this && this.__extends || (o = function (e, t) {
|
|
@@ -381920,7 +381924,7 @@ window.__require = function e(t, n, o) {
|
|
|
value: !0
|
|
|
});
|
|
|
n.PokerMasterHallSocket = void 0;
|
|
|
- var r = e("../../../../../pkw/Script/common/pb/pokermaster"), roomConfig = r.pokermaster_proto_hall, s = e("../../lobby/cv"), c = e("./PokerMasterDataMgr"), l = e("../../../common/net/NetWorkProxy"), u = e("./PokerMasterDef"), d = e("./PokerMasterRoomData"), p = function (e) {
|
|
|
+ var r = loadModule("../../../../../pkw/Script/common/pb/pokermaster"), roomConfig = r.pokermaster_proto_hall, s = loadModule("../../lobby/cv"), c = loadModule("./PokerMasterDataMgr"), l = loadModule("../../../common/net/NetWorkProxy"), u = loadModule("./PokerMasterDef"), d = loadModule("./PokerMasterRoomData"), p = function (e) {
|
|
|
i(t, e);
|
|
|
function t() {
|
|
|
return null !== e && e.apply(this, arguments) || this;
|
|
@@ -382029,13 +382033,13 @@ window.__require = function e(t, n, o) {
|
|
|
t.prototype.requestJoinRoom = function (e) {
|
|
|
this._requestJoinRoom(e);
|
|
|
};
|
|
|
- t.prototype._requestJoinRoom = function (e) {
|
|
|
+ t.prototype._requestJoinRoom = function (room_id) {
|
|
|
console.log("Saad in join room request " + s.default.dataHandler.getUserData().m_bIsLoginGameServerSucc);
|
|
|
if (s.default.dataHandler.getUserData().m_bIsLoginGameServerSucc) {
|
|
|
var t = roomConfig.JoinRoomReq.create();
|
|
|
- t.roomid = e;
|
|
|
- console.log("saad sending join room msg with room id " + e);
|
|
|
- this._sendNetMsg("JoinRoomReq", t, roomConfig.CMD.JOIN_ROOM_REQ, e);
|
|
|
+ t.roomid = room_id;
|
|
|
+ console.log("saad sending join room msg with room id " + room_id);
|
|
|
+ this._sendNetMsg("JoinRoomReq", t, roomConfig.CMD.JOIN_ROOM_REQ, room_id);
|
|
|
} else this.requestVerifyLogin();
|
|
|
};
|
|
|
t.prototype._handleJoinRoomResponse = function (e, t) {
|
|
@@ -382537,7 +382541,7 @@ window.__require = function e(t, n, o) {
|
|
|
"./PokerMasterDef": "PokerMasterDef",
|
|
|
"./PokerMasterRoomData": "PokerMasterRoomData"
|
|
|
}],
|
|
|
- PokerMasterNetWork: [function (e, t, n) {
|
|
|
+ PokerMasterNetWork: [function (e, t, thisPokerMasterNetWork) {
|
|
|
"use strict";
|
|
|
cc._RF.push(t, "975ceEgFRxDG7lkqU+MeLCe", "PokerMasterNetWork");
|
|
|
var o = this && this.__decorate || function (e, t, n, o) {
|
|
@@ -382545,10 +382549,10 @@ window.__require = function e(t, n, o) {
|
|
|
if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) a = Reflect.decorate(e, t, n, o); else for (var s = e.length - 1; s >= 0; s--) (i = e[s]) && (a = (r < 3 ? i(a) : r > 3 ? i(t, n, a) : i(t, n)) || a);
|
|
|
return r > 3 && a && Object.defineProperty(t, n, a), a;
|
|
|
};
|
|
|
- Object.defineProperty(n, "__esModule", {
|
|
|
+ Object.defineProperty(thisPokerMasterNetWork, "__esModule", {
|
|
|
value: !0
|
|
|
});
|
|
|
- n.PokerMasterNetWork = void 0;
|
|
|
+ thisPokerMasterNetWork.PokerMasterNetWork = void 0;
|
|
|
var i = e("../../lobby/cv"), r = cc._decorator, a = r.ccclass, s = (r.property,
|
|
|
function () {
|
|
|
function e() {
|
|
@@ -382653,7 +382657,7 @@ window.__require = function e(t, n, o) {
|
|
|
var t;
|
|
|
return t = o([a], e);
|
|
|
}());
|
|
|
- n.PokerMasterNetWork = s;
|
|
|
+ thisPokerMasterNetWork.PokerMasterNetWork = s;
|
|
|
cc._RF.pop();
|
|
|
}, {
|
|
|
"../../lobby/cv": "cv"
|
|
@@ -399380,23 +399384,23 @@ window.__require = function e(t, n, o) {
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
- e.prototype.RequestJoinRoom = function (e, t, n, i, r) {
|
|
|
+ e.prototype.RequestJoinRoom = function (gameId, roomId, isQuickRoom, isNeedPassword, roomPassWord) {
|
|
|
var a = this;
|
|
|
- void 0 === e && (e = this.current_gameId);
|
|
|
- void 0 === t && (t = this.current_roomId);
|
|
|
- void 0 === n && (n = this.isQuickRoom);
|
|
|
- void 0 === i && (i = this.isNeedPassword);
|
|
|
- void 0 === r && (r = this.roomPassWord);
|
|
|
- if (!(e >= o.GameId.ZoomTexas && e <= o.GameId.ZoomTexasMax) || lobbyCv.default.dataHandler.getActivityData().haveAvatar()) {
|
|
|
+ void 0 === gameId && (gameId = this.current_gameId);
|
|
|
+ void 0 === roomId && (roomId = this.current_roomId);
|
|
|
+ void 0 === isQuickRoom && (isQuickRoom = this.isQuickRoom);
|
|
|
+ void 0 === isNeedPassword && (isNeedPassword = this.isNeedPassword);
|
|
|
+ void 0 === roomPassWord && (roomPassWord = this.roomPassWord);
|
|
|
+ if (!(gameId >= o.GameId.ZoomTexas && gameId <= o.GameId.ZoomTexasMax) || lobbyCv.default.dataHandler.getActivityData().haveAvatar()) {
|
|
|
(function () {
|
|
|
- a.setCurrentGameID(e);
|
|
|
- a.setCurrentRoomID(t);
|
|
|
- console.log("Saad setting room id " + t);
|
|
|
- a.setRoomPassWord(r);
|
|
|
- a.setIsNeedPassword(i);
|
|
|
- a.setIsQuickRoom(n);
|
|
|
- a._checkShowLoadingByGameID(e);
|
|
|
- if (lobbyCv.default.netWork.isEncrypt(e) && !c.ecdhHandler.getInstance().ecdh_getNeedGenKeyState()) {
|
|
|
+ a.setCurrentGameID(gameId);
|
|
|
+ a.setCurrentRoomID(roomId);
|
|
|
+ console.log("Saad setting room id " + roomId);
|
|
|
+ a.setRoomPassWord(roomPassWord);
|
|
|
+ a.setIsNeedPassword(isNeedPassword);
|
|
|
+ a.setIsQuickRoom(isQuickRoom);
|
|
|
+ a._checkShowLoadingByGameID(gameId);
|
|
|
+ if (lobbyCv.default.netWork.isEncrypt(gameId) && !c.ecdhHandler.getInstance().ecdh_getNeedGenKeyState()) {
|
|
|
var o = c.ecdhHandler.getInstance().ecdh_getClientPubX(), l = c.ecdhHandler.getInstance().ecdh_getClientPubY();
|
|
|
c.ecdhHandler.getInstance().ecdh_setNeedGenKeyState(!0);
|
|
|
lobbyCv.default.worldNet.RequestSetEcdhKey(0, o, l);
|