From d259e05ca781a4d6273f650ecf9ae5f94716ab16 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Thu, 29 Sep 2022 10:07:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=8D=E8=83=BD=E7=94=A8=E3=80=91?= =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=94=B9=E8=81=94=E7=BD=91=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0ws=E7=9B=B8=E5=85=B3=EF=BC=8C=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E6=96=AD=E5=BC=80=E5=90=8E=E7=9A=84=E8=A1=8C=E4=B8=BA=E4=B8=8E?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=20=E6=A1=86=E6=9E=B6=E8=B7=9F=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework | 2 +- main.lua | 5 +++ 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_code.lua | 2 +- parts/language/lang_zh_trad.lua | 2 +- parts/net.lua | 61 +++++++++------------------------ 12 files changed, 32 insertions(+), 54 deletions(-) diff --git a/Zframework b/Zframework index 325168c2..503bba44 160000 --- a/Zframework +++ b/Zframework @@ -1 +1 @@ -Subproject commit 325168c2c17c112d26ccd7d366079d970ae9627a +Subproject commit 503bba44a462a49671b43e1d07f861e97a831b55 diff --git a/main.lua b/main.lua index 2bbc1a59..cad2550d 100644 --- a/main.lua +++ b/main.lua @@ -177,6 +177,11 @@ Z.setOnFnKeys({ function()for k,v in next,_G do print(k,v)end end, function()if love['_openConsole']then love['_openConsole']()end end, }) +Z.setOnGlobalKey('f11',function() + SETTING.fullscreen=not SETTING.fullscreen + applySettings() + saveSettings() +end) Z.setVersionText(VERSION.string) Z.setDebugInfo{ {"Cache",gcinfo}, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 746c99de..ecf95890 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -121,10 +121,10 @@ return{ loginOK="You are now logged in!", accessOK="Access granted", - wsConnecting="Websocket connecting…", wsFailed="WebSocket connection failed", wsClose="WebSocket closed:", netTimeout="Connection timed out", + serverDown="Oops! Server is down", onlinePlayerCount="Online", createRoomSuccessed="Room created", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 296a8cc6..abbef491 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -120,10 +120,10 @@ return{ loginOK="¡Ingreso con éxito!", accessOK="¡Autorizado exitoso!", - wsConnecting="Websocket Conectando", wsFailed="WebSocket conexión fallida", wsClose="WebSocket cerrado:", netTimeout="Tiempo de conexión agotado", + -- serverDown="Oops! Server is down", onlinePlayerCount="En línea", createRoomSuccessed="¡Sala creada con éxito!", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 1c463612..d40ca72d 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -111,10 +111,10 @@ return{ loginOK="Connecté avec succès !", accessOK="Autorisé avec succès !", - -- wsConnecting="Websocket Connecting", wsFailed="WebSocket connection échouée", -- wsClose="WebSocket Closed:", -- netTimeout="Network connection timeout", + -- serverDown="Oops! Server is down", -- onlinePlayerCount="Online", createRoomSuccessed="Salon créé avec succès !", diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua index f51867c4..78ebe48b 100644 --- a/parts/language/lang_id.lua +++ b/parts/language/lang_id.lua @@ -122,10 +122,10 @@ return{ loginOK="Anda telah gabung!", accessOK="Akses diberikan", - wsConnecting="Menghubungkan websocket…", wsFailed="Koneksi websocket gagal", wsClose="Websocket tertutup:", netTimeout="Koneksi waktu habis", + -- serverDown="Oops! Server is down", onlinePlayerCount="Online", createRoomSuccessed="Ruang terbuat", diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua index b4b505ec..1b56717c 100644 --- a/parts/language/lang_ja.lua +++ b/parts/language/lang_ja.lua @@ -122,10 +122,10 @@ return{ loginOK="ログインしています!", accessOK="アクセス権限を取得しました!", - wsConnecting="ウェブソケットに接続中…", wsFailed="ウェブソケットとの通信に失敗しました", wsClose="ウェブソケットとの通信を終了:", netTimeout="接続がタイムアウトしました", + -- serverDown="Oops! Server is down", onlinePlayerCount="オンライン人数", createRoomSuccessed="部屋を建てました", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 587d2b95..1427464c 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -109,10 +109,10 @@ return{ loginOK="Logado com sucesso!", accessOK="Autorizado com sucesso!", - -- wsConnecting="Websocket Connecting", wsFailed="WebSocket falha na conexão", wsClose="WebSocket closed:", -- netTimeout="Network connection timeout", + -- serverDown="Oops! Server is down", -- onlinePlayerCount="Online", -- createRoomSuccessed="Room successfully created!", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index a1b25cf0..42aaaef2 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -121,10 +121,10 @@ return{ loginOK="登录成功", accessOK="身份验证成功", - wsConnecting="正在连接", wsFailed="连接失败", wsClose="连接被断开:", netTimeout="连接超时", + serverDown="唉哟!服务器不在线", onlinePlayerCount="在线人数", createRoomSuccessed="创建房间成功！", diff --git a/parts/language/lang_zh_code.lua b/parts/language/lang_zh_code.lua index a35a1972..f857caee 100644 --- a/parts/language/lang_zh_code.lua +++ b/parts/language/lang_zh_code.lua @@ -121,10 +121,10 @@ return{ loginOK="login.Success=true", accessOK="Access.Granted=true", - wsConnecting="Websocket.Connect();", wsFailed="Error.Websocket.Failed();", wsClose="Error.Websocket.Close=", netTimeout="Error.ConnectTimeOut();", + serverDown="Error.ServerDown();", onlinePlayerCount="OnlinePlayerCount", createRoomSuccessed="CreateRoom.Successs=true", diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 0559ece9..24993c04 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -121,10 +121,10 @@ return{ loginOK="登錄成功", accessOK="身份認證成功", - wsConnecting="正在連接……", wsFailed="連接失敗", wsClose="連接斷開:", netTimeout="連接超時", + serverDown="哎唷!服務器不在线", onlinePlayerCount="在線用戶數", createRoomSuccessed="房間已創建！", diff --git a/parts/net.lua b/parts/net.lua index a10e46f4..757040a1 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -27,36 +27,6 @@ local NET={ onlineCount="_", } -local mesType={ - Connect=true, - Self=true, - Broadcast=true, - Private=true, - Server=true, -} - ---Parse json message -local function _parse(res) - res=JSON.decode(res) - if res then - if mesType[res.type]then - return res - else - MES.new('warn',("[%s] %s"):format(res.type or"?",res.reason or"[NO Message]")) - end - end -end - ---WS close message -local function _closeMessage(message) - local mes=JSON.decode(message) - if mes then - MES.new('info',("%s %s|%s"):format(text.wsClose,mes.type or"",mes.reason or"")) - else - MES.new('info',("%s %s"):format(text.wsClose,message)) - end -end - -------------------------- @@ -69,7 +39,7 @@ local function getMsg(request,timeout) if type(mes.body)=='string' and #mes.body>0 then return JSON.decode(mes.body) else - MES.new('info',"Oops! Server is down") + MES.new('info',text.serverDown) return end else @@ -98,7 +68,7 @@ function NET.getCode(email) MES.new('error',res.message,5) end else - MES.new('warn',"Request failed",5) + MES.new('warn',text.requestFailed,5) end WAIT.interrupt() @@ -138,7 +108,7 @@ function NET.codeLogin(code) MES.new('error',res.message,5) end else - MES.new('warn',"Request failed",5) + MES.new('warn',text.requestFailed,5) end WAIT.interrupt() @@ -176,7 +146,7 @@ function NET.setPW(code,pw) MES.new('error',res.message,5) end else - MES.new('warn',"Request failed",5) + MES.new('warn',text.requestFailed,5) end WAIT.interrupt() @@ -229,7 +199,6 @@ function NET.autoLogin() USER.rToken=res.data.refreshToken USER.aToken=res.data.accessToken NET.connectWS() - MES.new('info',"Login successed",5) SCN.go('net_menu') WAIT.interrupt() return @@ -251,7 +220,6 @@ function NET.autoLogin() }, },6.26) if res then - print(TABLE.dump(res)) if res.code==200 then USER.rToken=res.data.refreshToken USER.aToken=res.data.accessToken @@ -305,7 +273,7 @@ function NET.pwLogin(email,pw) MES.new('error',res.message,5) end else - MES.new('warn',"Request failed",5) + MES.new('warn',text.requestFailed,5) end WAIT.interrupt() @@ -321,6 +289,7 @@ end -------------------------- local function wsSend(act,data) + -- print("SEND ACT: "..act) WS.send('game',JSON.encode{ action=act, data=data, @@ -454,9 +423,7 @@ end --WS function NET.connectWS() if WS.status('game')=='dead'then - WS.connect('game','',{ - ['x-access-token']=USER.aToken, - },6) + WS.connect('game','',{['x-access-token']=USER.aToken},6) TASK.new(NET.updateWS) end end @@ -471,13 +438,19 @@ function NET.updateWS() if op=='ping'then elseif op=='pong'then elseif op=='close'then - _closeMessage(message) + local res=JSON.decode(message) + MES.new('info',("$1 $2"):repD(text.wsClose,res and res.message or message)) + if res and res.message then LOG(res.message) end + TEST.yieldUntilNextScene() + while SCN.stack[#SCN.stack-1]~='main' do SCN.pop() end + SCN.back() return else - local res=_parse(message) + local res=JSON.decode(message) if res then - if res.type=='Connect'then - MES.new('info','Connected!') + -- print(("RECV ACT: $1 ($2)"):repD(res.action,res.type)) + if res.type=='Failed' then + MES.new('warn',"Request failed: "..(res.reason or "/")) elseif res.action==1100 then-- TODO elseif res.action==1101 then-- TODO elseif res.action==1102 then-- TODO