diff --git a/draw.py b/draw.py index b94536d..8ebfcd6 100644 --- a/draw.py +++ b/draw.py @@ -5,20 +5,28 @@ def drawUserList(nowUserList,screen): listSTR = nowUserList[7:] listJSON = json.loads(listSTR) - #[['127.0.0.1', 52362], ['127.0.0.1', 52370]] + + # [['127.0.0.1', 52362], ['127.0.0.1', 52370]] + # [{'name': ['127.0.0.1', 55888], 'score': 0}, {'name': ['127.0.0.1', 55900], 'score': 0}] + print(list) y = 100 cross = 20 pygame.draw.rect(screen,(255,255,255),[900,100,200,380]) for sockName in listJSON: - pygame.draw.rect(screen,(171, 254, 250),[900,y,200,30],0) # 輸入匡的矩形 - pgStringVar = pygame.font.Font(None,25).render(str(sockName),False,(0,0,0))# 文字物件 - screen.blit(pgStringVar,(910,y+10))# draw font + pygame.draw.rect(screen,(171, 254, 250),[850,y,200,30],0) # 輸入匡的矩形 + pgStringVar = pygame.font.Font(None,25).render(str(sockName['name']),False,(0,0,0))# 文字物件 + screen.blit(pgStringVar,(870,y+10))# draw font + + pgStringVar = pygame.font.Font(None,25).render(str(sockName['score']),False,(255,0,0))# 文字物件 + screen.blit(pgStringVar,(860,y+10))# draw font + pygame.display.update() y = y+30+cross def drawerReceive(sock,screen): while True: data = sock.recv(1024).decode('utf-8') + if data[0:6] == "[list]": drawUserList(data,screen) elif data == "restart": diff --git a/main.py b/main.py index 313a8e4..74196c6 100644 --- a/main.py +++ b/main.py @@ -109,7 +109,7 @@ class Room: # Send socket list to client to build a user list and put it beside picture. for i in self.sockList: - allPeerName.append(i.getpeername()) + allPeerName.append({'name':i.getpeername(),'score':0}) for sock in self.sockList: sock.send("[list] {}".format(json.dumps(allPeerName)).encode('utf-8')) receiveDataThread = threading.Thread(target=self.receiveData,args=(sock,),daemon=True) @@ -168,7 +168,7 @@ class Room: allPeerName = [] # Send socket list to client to build a user list and put it beside picture. for i in self.sockList: - allPeerName.append(i.getpeername()) + allPeerName.append({'name':i.getpeername(),'score':0}) for sock in self.sockList: sock.send("[list] {}".format(json.dumps(allPeerName)).encode('utf-8')) # Close Process