From 87a1424df072d60553e18a91bf96a455d3ea54c6 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Tue, 27 Apr 2021 10:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=8E=B7=E5=8F=96=E5=88=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=A4=B4=E5=83=8F=E6=97=B6=E6=98=BE=E7=A4=BA=E9=9A=8F?=
 =?UTF-8?q?=E6=9C=BA=E6=96=B9=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.lua        |  2 +-
 parts/users.lua | 34 ++++++++++++++++------------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/main.lua b/main.lua
index ee9bd4bd..9c42dbd5 100644
--- a/main.lua
+++ b/main.lua
@@ -67,9 +67,9 @@ require"parts.gametoolfunc"
 FREEROW=	require"parts.freeRow"
 DATA=		require"parts.data"
 
-USERS=		require"parts.users"
 TEXTURE=	require"parts.texture"
 SKIN=		require"parts.skin"
+USERS=		require"parts.users"
 NET=		require"parts.net"
 VK=			require"parts.virtualKey"
 PLY=		require"parts.player"
diff --git a/parts/users.lua b/parts/users.lua
index 80734fc6..6714554b 100644
--- a/parts/users.lua
+++ b/parts/users.lua
@@ -18,13 +18,14 @@ local emptyUser={
 	hash="",
 	new=false,
 }
-local texture_noImage=DOGC{128,128,
-	{"setCL",.1,.1,.1},
-	{"fRect",0,0,128,128},
-	{"setCL",1,1,1},
-	{"setFT",100},
-	{"mText","?",64,-6},
-}
+local defaultAvatar={}
+for i=1,29 do
+	local img=TEXTURE.miniBlock[i]
+	defaultAvatar[i]=DOGC{128,128,
+		{"clear",.1,.1,.1},
+		{"draw",img,63,63,.2,30,30,img:getWidth()/2,img:getHeight()/2},
+	}
+end
 
 local db_img={}
 local db=setmetatable({},{__index=function(self,k)
@@ -32,9 +33,10 @@ local db=setmetatable({},{__index=function(self,k)
 	local file="cache/user"..k..".dat"
 	local d=fs.getInfo(file)and JSON.decode(fs.read(file))or TABLE.copy(emptyUser)
 	rawset(self,k,d)
-	if type(d.hash)=="string"and #d.hash>0 and fs.getInfo("cache/"..d.hash)then
-		db_img[k]=loadAvatar("cache/"..d.hash)
-	end
+	db_img[k]=
+		type(d.hash)=="string"and #d.hash>0 and fs.getInfo("cache/"..d.hash)and
+		loadAvatar("cache/"..d.hash)or
+		defaultAvatar[math.random(29)]
 	return d
 end})
 
@@ -60,15 +62,11 @@ function USERS.getUsername(uid)return db[uid].username end
 function USERS.getMotto(uid)return db[uid].motto end
 function USERS.getHash(uid)return db[uid].hash end
 function USERS.getAvatar(uid)
-	if db_img[uid]then
-		return db_img[uid]
-	else
-		if not db[uid].new then
-			NET.getUserInfo(uid)
-			db[uid].new=true
-		end
-		return texture_noImage
+	if not db[uid].new then
+		NET.getUserInfo(uid)
+		db[uid].new=true
 	end
+	return db_img[uid]
 end
 
 return USERS
\ No newline at end of file