修正merge

2020-11-28 18:03:28 +08:00
parent 9c14005cde
commit f17724c7ef
3 changed files with 5 additions and 14 deletions
--- a/parts/globalTables.lua
+++ b/parts/globalTables.lua
@@ -282,16 +282,6 @@ SETTING={
 	VKAlpha=.3,
 }

-ACCOUNT={
-	email=nil,
-	auth_token=nil,
-	access_token=nil,
-
-	username=nil,
-	motto=nil,
-	avatar=nil,
-}
-
 STAT={
 	version=VERSION_NAME,
 	run=0,game=0,time=0,
@@ -310,11 +300,13 @@ for i=1,25 do
 end

 ACCOUNT={
+	email=nil,
+	auth_token=nil,
+	access_token=nil,
+
 	username=nil,
 	motto=nil,
 	avatar=nil,
-	auth_token=nil,
-	access_token=nil
 }

 keyMap={