From ef64e0f6ef5b21d865556ba0ec0a609eb43ca66b Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Tue, 30 Mar 2021 12:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=BD=91=E7=BB=9C=E5=92=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/globalTables.lua |  2 --
 parts/net.lua          | 24 ++++++++++++++++--------
 parts/scenes/login.lua |  1 -
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/parts/globalTables.lua b/parts/globalTables.lua
index 229a87d7..d26a094a 100644
--- a/parts/globalTables.lua
+++ b/parts/globalTables.lua
@@ -223,9 +223,7 @@ USER=FILE.load("conf/user")or{--User infomation
 	--Network infos
 	name=false,
 	id=false,
-	email=false,
 	authToken=false,
-	accessToken=false,
 
 	--Local data
 	xp=0,lv=1,
diff --git a/parts/net.lua b/parts/net.lua
index 90c5f17e..55570983 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -3,6 +3,7 @@ local NET={
 	login=false,
 	allow_online=false,
 	roomList=false,
+	accessToken=false,
 }
 
 --Lock & Unlock submodule
@@ -48,17 +49,25 @@ function NET.getUserInfo(id,ifDetail)
 	})
 end
 function NET.storeUserInfo(res)
-	local user
-	if not USERS[res.id]then
+	local user=USERS[res.id]
+	if not user then
 		user={}
 		user.email=res.email
 		user.name=res.username
 		USERS[res.id]=user
 	else
-		user=USERS[res.id]
+		user.email=res.email
+		user.name=res.username
 		if not user.motto then user.motto=res.motto end
 		if not user.avatar then user.avatar=res.avatar end
 	end
+
+	--Get own name
+	if res.id==USER.id then
+		USER.name=res.name
+		FILE.save(USER,"conf/user")
+	end
+
 	-- FILE.save(USERS,"conf/users")
 end
 
@@ -67,7 +76,7 @@ function NET.wsConnectPlay()
 	if NET.lock("connectPlay")then
 		WS.connect("play","/play",JSON.encode{
 			id=USER.id,
-			accessToken=USER.accessToken,
+			accessToken=NET.accessToken,
 		})
 	end
 end
@@ -188,21 +197,20 @@ function NET.TICK_WS_user()
 							if res.id then
 								USER.id=res.id
 								USER.authToken=res.authToken
+								FILE.save(USER,"conf/user","q")
 								SCN.back()
 							end
-							FILE.save(USER,"conf/user","q")
 							LOG.print(text.loginSuccessed)
 
 							--Get self infos
-							NET.getUserInfo()
+							NET.getUserInfo(USER.id)
 						elseif res.action==0 then--Get accessToken
-							USER.accessToken=res.accessToken
+							NET.accessToken=res.accessToken
 							LOG.print(text.accessSuccessed)
 							NET.wsConnectPlay()
 							NET.unlock("accessToken")
 						elseif res.action==1 then--Get userInfo
 							NET.storeUserInfo(res)
-							FILE.save(USER,"conf/user")
 						end
 					else
 						WS.alert("user")
diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua
index 4885f58b..d6517847 100644
--- a/parts/scenes/login.lua
+++ b/parts/scenes/login.lua
@@ -6,7 +6,6 @@ local function login()
 	elseif #password==0 then
 		LOG.print(text.noPassword)return
 	end
-	USER.email=email
 	WS.connect("user","/user",JSON.encode{
 		email=email,
 		password=password,