diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index ee20a478..9d14c1d3 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -101,6 +101,7 @@ return{ joinRoom="has joined the room.", leaveRoom="has left the room.", ready="READY", + set="SET", champion="$1 won", chatRemain="Online: ", chatStart="------Beginning of log------", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 63b7ece4..77dcc603 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -102,6 +102,7 @@ return{ joinRoom="a rejoint le salon.", leaveRoom="a quitté le salon.", -- ready="READY", + -- set="SET", champion="$1 a gagné", chatRemain="En ligne : ", chatStart="--------Début des logs--------", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 583da9b8..0eefd685 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -102,6 +102,7 @@ return{ joinRoom="Entrou a sala.", leaveRoom="Saiu da sala.", -- ready="READY", + -- set="SET", -- champion="$1 won", chatRemain="Online: ", chatStart="------Começo do log------", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 41f60507..b09773f0 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -102,6 +102,7 @@ return{ joinRoom="entró a la sala.", leaveRoom="salió de la sala.", -- ready="READY", + -- set="SET", champion="$1 ganó!", chatRemain="Usuarios en línea: ", chatStart="------Comienzo del historial------", diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index c1e4dfc5..4f4f7281 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -46,7 +46,6 @@ return{ createRoomTooFast="手痒要开这么多房间?", createRoomSuccessed="创好了", started="开了", - ready="预备!", champion="神仙是 $1", stat={ diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 3d78166f..4d0d1b5f 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -100,7 +100,8 @@ return{ started="游戏中", joinRoom="进入房间", leaveRoom="离开房间", - ready="准备!", + ready="各就各位!", + set="预备!", champion="$1 获胜", chatRemain="人数:", chatStart="------消息的开头------", diff --git a/parts/net.lua b/parts/net.lua index c5f7fd83..6e01aa4c 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -6,6 +6,7 @@ local NET={ allow_online=false, allReady=false, serverGaming=false, + connectingStream=false, roomList={}, accessToken=false, rid=false, @@ -441,6 +442,7 @@ function NET.updateWS_play() NET.allReady=true elseif res.action==8 then--Set NET.rsid=d.rid + NET.connectingStream=true NET.wsconn_stream() elseif res.action==9 then--Game finished NET.allReady=false @@ -474,6 +476,7 @@ function NET.updateWS_stream() if res.type=='Connect'then NET.unlock('wsc_stream') elseif res.action==0 then--Game start + NET.connectingStream=false SCN.socketRead('Go',d) elseif res.action==1 then--Game finished --? diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index c9b6e1f1..3f43d691 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -268,10 +268,12 @@ function scene.draw() gc.print(p.username,240,60+50*i) end - --All-ready mark - if NET.allReady then - gc.setColor(.1,1,0,.9) - setFont(60) + --Ready & Set mark + gc.setColor(.1,1,0,.9) + setFont(60) + if NET.connectingStream then + mStr(text.set,640,10) + elseif NET.allReady then mStr(text.ready,640,10) end