From c1936441dda6f3ccc51294346495d9d091328fb2 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Mon, 24 Oct 2022 22:49:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B8=A2=E5=87=BA=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E7=9A=84=E6=8F=90=E7=A4=BA=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 2 +- parts/language/lang_es.lua | 2 +- parts/language/lang_fr.lua | 2 +- parts/language/lang_id.lua | 2 +- parts/language/lang_ja.lua | 2 +- parts/language/lang_pt.lua | 2 +- parts/language/lang_zh.lua | 2 +- parts/language/lang_zh_trad.lua | 2 +- parts/net.lua | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index e78f00e8..ae0d033e 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -183,7 +183,7 @@ return{ onlinePlayerCount="Online: $1", createRoomSuccessed="Room created", - playerKicked="[$1] removed [$2] from room", + playerKicked="$1 removed $2 from room", started="Playing", joinRoom="$1 has entered the room.", leaveRoom="$1 has left the room.", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 549a0c71..dce023de 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -182,7 +182,7 @@ return{ onlinePlayerCount="En línea: $1", createRoomSuccessed="¡Sala creada con éxito!", - -- playerKicked="[$1] removed [$2] from room", + -- playerKicked="$1 removed $2 from room", started="En juego", joinRoom="$1 entró a la sala.", leaveRoom="$1 salió de la sala.", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 3f69b404..78b9dec1 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -174,7 +174,7 @@ return{ -- onlinePlayerCount="Online: $1", createRoomSuccessed="Salon créé avec succès !", - -- playerKicked="[$1] removed [$2] from room", + -- playerKicked="$1 removed $2 from room", -- started="Playing", joinRoom="$1 a rejoint le salon.", leaveRoom="$1 a quitté le salon.", diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua index a6965d7f..c9e65f94 100644 --- a/parts/language/lang_id.lua +++ b/parts/language/lang_id.lua @@ -184,7 +184,7 @@ return{ onlinePlayerCount="Online: $1", createRoomSuccessed="Ruang terbuat", - -- playerKicked="[$1] removed [$2] from room", + -- playerKicked="$1 removed $2 from room", started="Bermain", joinRoom="$1 telah memasuki ruangan.", leaveRoom="$1 telah keluar dari ruangan.", diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua index ac66150f..0991ffe4 100644 --- a/parts/language/lang_ja.lua +++ b/parts/language/lang_ja.lua @@ -184,7 +184,7 @@ return{ onlinePlayerCount="オンライン人数: $1", createRoomSuccessed="部屋を建てました", - -- playerKicked="[$1] removed [$2] from room", + -- playerKicked="$1 removed $2 from room", started="プレイ中", joinRoom="$1 が入室しました", leaveRoom="$1 が退出しました", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index a89a1753..71151984 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -171,7 +171,7 @@ return{ -- onlinePlayerCount="Online: $1", -- createRoomSuccessed="Room successfully created!", - -- playerKicked="[$1] removed [$2] from room", + -- playerKicked="$1 removed $2 from room", -- started="Playing", joinRoom="$1 Entrou a sala.", leaveRoom="$1 Saiu da sala.", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 54f8b156..822a8c61 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -183,7 +183,7 @@ return{ onlinePlayerCount="在线人数: $1", createRoomSuccessed="创建房间成功！", - playerKicked="<$1>把<$2>移出了房间", + playerKicked="$1 把 $2 移出了房间", started="游戏中", joinRoom="$1 进入房间", leaveRoom="$1 离开房间", diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 97e0dbbb..949a591e 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -183,7 +183,7 @@ return{ onlinePlayerCount="在線用戶數: $1", createRoomSuccessed="房間已創建！", - playerKicked="<$1>把<$2>移出了房間", + playerKicked="#$1 把 #$2 移出了房間", started="遊戲中", joinRoom="$1 進入房間", leaveRoom="$1 離開房間", diff --git a/parts/net.lua b/parts/net.lua index b006147f..66c6cc86 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -633,7 +633,7 @@ function NET.wsCallBack.room_enter(body) readyMode=p.state, config=p.config, } - NET.textBox:push{COLOR.Y,text.joinRoom:repD(USERS.getUsername(p.playerId).."#"..p.playerId.." ")} + NET.textBox:push{COLOR.Y,text.joinRoom:repD(USERS.getUsername(p.playerId).."#"..p.playerId)} if not GAME.playing then SFX.play('connected') NET.freshRoomAllReady() @@ -641,7 +641,7 @@ function NET.wsCallBack.room_enter(body) end end function NET.wsCallBack.room_kick(body) - MES.new('info',text.playerKicked:repD(body.data.executorId,body.data.playerId)) + MES.new('info',text.playerKicked:repD(USERS.getUsername(body.data.executorId).."#"..body.data.executorId,USERS.getUsername(body.data.playerId).."#"..body.data.playerId)) _playerLeaveRoom(body.data.playerId) end function NET.wsCallBack.room_leave(body)