From c7356557b2769ae9fed04256c99f5e436eb97dc5 Mon Sep 17 00:00:00 2001 From: "guoqing.zhu" <1521292690@qq.com> Date: Tue, 31 May 2022 19:29:02 +0800 Subject: [PATCH] update --- assets/scripts/Config.js | 2 ++ assets/scripts/UI/UIMain.js | 10 ++++++++-- assets/scripts/UI/guns/UIGuns.ts | 1 - assets/scripts/UILogin.js | 6 ++++++ assets/scripts/manages/NetManage.js | 4 ++++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/assets/scripts/Config.js b/assets/scripts/Config.js index 1636009f..dab02308 100644 --- a/assets/scripts/Config.js +++ b/assets/scripts/Config.js @@ -19,6 +19,8 @@ var MainConfig = { version: "0.1.0", isoffical: false, viewscale: 0.5, + packageid: 1, //0 官网apk 1 googleplay aab 2 ios + hotfixVersion:"0.5.0" }; export var isTest = true; diff --git a/assets/scripts/UI/UIMain.js b/assets/scripts/UI/UIMain.js index b144c765..fcb8d242 100644 --- a/assets/scripts/UI/UIMain.js +++ b/assets/scripts/UI/UIMain.js @@ -203,6 +203,8 @@ cc.Class({ cc.Notifier.on('SMCustomMsgNotify', this, this.getCustomMsg.bind(this)); + cc.Notifier.on("multipointlogin",this,this.multipointout.bind(this)); + this.refreshBaseInfo(); NetManage.getItemList(); NetManage.getHeroList(); @@ -229,9 +231,12 @@ cc.Class({ } }, + multipointout(){ + jcgamelog.addOperation(OperationType.LOGIN, 'multipointout'); + // uimanger.showUI(LogoutTip.prefabPath); + }, + getCustomMsg(msg) { - // - console.log('get once '); if (!cc.find('Canvas').getComponentInChildren('GameUI')) { uimanger.showUI(InviteTip.prefabPath, msg); } @@ -266,6 +271,7 @@ cc.Class({ cc.Notifier.off('getreward', this); cc.Notifier.off('hasConnectWallet', this); cc.Notifier.off("showFriendRedPoint", this, this.updateRedPoint.bind(this)); + cc.Notifier.off("multipointlogin",this,this.multipointout.bind(this)); }, updateRedPoint(msg) { diff --git a/assets/scripts/UI/guns/UIGuns.ts b/assets/scripts/UI/guns/UIGuns.ts index b28e9b62..6c2a982c 100644 --- a/assets/scripts/UI/guns/UIGuns.ts +++ b/assets/scripts/UI/guns/UIGuns.ts @@ -27,7 +27,6 @@ export class UIGuns extends cc.Component { } initdata(data, type = 0) { - console.log(data); this._data = data; const list = data.gun_list; let newlist = []; diff --git a/assets/scripts/UILogin.js b/assets/scripts/UILogin.js index c1c5e6f8..9b276851 100644 --- a/assets/scripts/UILogin.js +++ b/assets/scripts/UILogin.js @@ -241,6 +241,12 @@ cc.Class({ 'gamestart', ); + + console.log(`current packageid `+ Config.mainConfig.packageid) + console.log(`current version `+ Config.mainConfig.version) + + jcgamelog.addOperation(OperationType.Login,Config.mainConfig.packageid) + if (!localStorage.getItem('currentNet')) { localStorage.setItem('currentNet', allBaseNet.japan); } else { diff --git a/assets/scripts/manages/NetManage.js b/assets/scripts/manages/NetManage.js index 825e677f..ecf25ae1 100644 --- a/assets/scripts/manages/NetManage.js +++ b/assets/scripts/manages/NetManage.js @@ -55,6 +55,10 @@ module.exports = { cb2(obj); } } + + if(obj.errcode == 1001){ + cc.Notifier.emit('multipointlogin'); // 多点登录 + } }, function (errcode, errmsg) { setTimeout(() => {