From ec1d3125c63e47761ef61f33bf5263fc03bd68f4 Mon Sep 17 00:00:00 2001
From: "guoqing.zhu" <1521292690@qq.com>
Date: Tue, 31 May 2022 20:44:47 +0800
Subject: [PATCH] update

---
 assets/res/prefabs/NUI/UIMain.prefab          |  4 +-
 .../prefabs/tips/pb_mulitlogin.prefab         | 52 +++++++++++++++----
 assets/scripts/UI/UIMain.js                   |  1 +
 assets/scripts/manages/NetManage.js           |  2 +
 4 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/assets/res/prefabs/NUI/UIMain.prefab b/assets/res/prefabs/NUI/UIMain.prefab
index d768f3f8..e8d4d49e 100644
--- a/assets/res/prefabs/NUI/UIMain.prefab
+++ b/assets/res/prefabs/NUI/UIMain.prefab
@@ -27028,8 +27028,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 350,
-      "y": 56,
+      "x": 367.8,
+      "y": 70.4,
       "z": 0
     },
     "_scale": {
diff --git a/assets/resources/prefabs/tips/pb_mulitlogin.prefab b/assets/resources/prefabs/tips/pb_mulitlogin.prefab
index a711197d..62e6927a 100644
--- a/assets/resources/prefabs/tips/pb_mulitlogin.prefab
+++ b/assets/resources/prefabs/tips/pb_mulitlogin.prefab
@@ -28,10 +28,13 @@
     "_components": [
       {
         "__id__": 26
+      },
+      {
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -53,8 +56,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -560,
+      "x": 512,
+      "y": 256,
       "z": 0
     },
     "_scale": {
@@ -216,7 +219,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "266fe3de-145d-4afa-a9f6-703d61b4f327"
     },
     "fileId": "07qL0bJqBOh4yGpvrcELwA",
     "sync": false
@@ -448,7 +451,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "266fe3de-145d-4afa-a9f6-703d61b4f327"
     },
     "fileId": "94AWb5KyJIX6vIxw/rj4SH",
     "sync": false
@@ -459,7 +462,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "266fe3de-145d-4afa-a9f6-703d61b4f327"
     },
     "fileId": "4eefoafxVEv70zaImVQ8Gz",
     "sync": false
@@ -557,7 +560,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "266fe3de-145d-4afa-a9f6-703d61b4f327"
     },
     "fileId": "7b4YVNrXlOKYKyYtJwswiw",
     "sync": false
@@ -726,7 +729,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "266fe3de-145d-4afa-a9f6-703d61b4f327"
     },
     "fileId": "d2iwxcSYpCdJzNbtd4krDX",
     "sync": false
@@ -845,7 +848,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "266fe3de-145d-4afa-a9f6-703d61b4f327"
     },
     "fileId": "d69oyUk3JP6LzbFCW+ItgI",
     "sync": false
@@ -884,7 +887,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "266fe3de-145d-4afa-a9f6-703d61b4f327"
     },
     "fileId": "69EpfNJB5Atpsstzmk4aIt",
     "sync": false
@@ -899,13 +902,40 @@
     "_enabled": true,
     "_id": ""
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1024,
+    "_originalHeight": 512,
+    "_id": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "266fe3de-145d-4afa-a9f6-703d61b4f327"
     },
     "fileId": "93A5nleKtJr5XHe2+4bUvp",
     "sync": false
diff --git a/assets/scripts/UI/UIMain.js b/assets/scripts/UI/UIMain.js
index dca1cdb1..66522545 100644
--- a/assets/scripts/UI/UIMain.js
+++ b/assets/scripts/UI/UIMain.js
@@ -239,6 +239,7 @@ cc.Class({
 	},
 
 	multipointout(){
+		console.log("多点登录，显示推出")
 		jcgamelog.addOperation(OperationType.LOGIN, 'multipointout');
 		uimanger.showUI(MulitLoginTip.prefabPath)
 	},
diff --git a/assets/scripts/manages/NetManage.js b/assets/scripts/manages/NetManage.js
index ecf25ae1..eee66025 100644
--- a/assets/scripts/manages/NetManage.js
+++ b/assets/scripts/manages/NetManage.js
@@ -56,7 +56,9 @@ module.exports = {
 					}
 				}
 
+				console.log(obj.errcode)
 				if(obj.errcode == 1001){
+					console.log("多点登录")
 					cc.Notifier.emit('multipointlogin'); // 多点登录
 				}
 			},