From 330cb313e75179b5a1fc15ee31ff64d778e309d5 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Wed, 2 Jun 2021 08:51:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=94=E7=BD=91=E5=AF=B9?=
 =?UTF-8?q?=E6=88=98=E6=88=BF=E9=97=B4=E5=86=85=E6=96=B0=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/scenes/net_game.lua | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua
index 42e7fbbb..231009bb 100644
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -1,6 +1,6 @@
 local gc,kb,tc=love.graphics,love.keyboard,love.touch
 
-local gc_setColor,gc_print=gc.setColor,gc.print
+local gc_setColor,gc_print,gc_printf,gc_draw=gc.setColor,gc.print,gc.printf,gc.draw
 local setFont,mStr=setFont,mStr
 
 local ins=table.insert
@@ -17,6 +17,7 @@ local upstreamProgress
 local lastBackTime=0
 local noTouch,noKey=false,false
 local touchMoveLastFrame=false
+local newMessageTimer
 
 local function _playerSort(a,b)return a.place<b.place end
 local function _setReady()NET.signal_setMode(1)end
@@ -58,6 +59,7 @@ function scene.sceneInit(org)
 	playing=false
 	lastUpstreamTime=0
 	upstreamProgress=1
+	newMessageTimer=0
 
 	if org=='setting_game'then NET.changeConfig()end
 	if NET.specSRID then
@@ -197,6 +199,7 @@ function scene.socketRead(cmd,d)
 			COLOR.Y,text.leaveRoom,
 		}
 	elseif cmd=='talk'then
+		newMessageTimer=60
 		textBox:push{
 			COLOR.Z,d.username,
 			COLOR.dY,"#"..d.uid.." ",
@@ -241,6 +244,7 @@ function scene.update(dt)
 	if NET.checkPlayDisconn()then
 		NET.wsclose_stream()
 		SCN.back()
+		return
 	end
 	if playing then
 		local P1=PLAYERS[1]
@@ -273,6 +277,9 @@ function scene.update(dt)
 	else
 		netPLY.update()
 	end
+	if newMessageTimer>0 then
+		newMessageTimer=newMessageTimer-1
+	end
 end
 
 function scene.draw()
@@ -315,10 +322,10 @@ function scene.draw()
 		--Room info.
 		gc_setColor(1,1,1)
 		setFont(25)
-		gc.printf(NET.roomState.roomInfo.name,0,685,1270,'right')
+		gc_printf(NET.roomState.roomInfo.name,0,685,1270,'right')
 		setFont(40)
-		gc.print(netPLY.getCount().."/"..NET.roomState.capacity,70,655)
-		if NET.roomState.private then gc.draw(IMG.lock,30,668)end
+		gc_print(netPLY.getCount().."/"..NET.roomState.capacity,70,655)
+		if NET.roomState.private then gc_draw(IMG.lock,30,668)end
 		if NET.roomState.start then gc_setColor(0,1,0)gc_print(text.started,230,655)end
 
 		--Profile
@@ -329,10 +336,10 @@ function scene.draw()
 	end
 
 	--New message
-	if textBox.new then
+	if newMessageTimer>0 then
 		setFont(40)
-		gc_setColor(1,1,0)
-		gc.print("M",430,10)
+		gc_setColor(.3,.7,1,(newMessageTimer/60)^2)
+		gc_print("M",430,10)
 	end
 end
 scene.widgetList={