From b769d1b1d576c8294b42a3d4257656b97bc188db Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 27 Dec 2020 21:49:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=8B=E5=89=8D=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E5=90=8D=E6=89=93=E9=94=99=EF=BC=8C=E5=87=86=E5=A4=87?= =?UTF-8?q?=E5=A5=BD=E8=8E=B7=E5=8F=96=E6=88=BF=E9=97=B4=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/globalTables.lua | 2 +- parts/language/lang_en.lua | 2 +- parts/language/lang_fr.lua | 2 +- parts/language/lang_sp.lua | 2 +- parts/language/lang_zh.lua | 2 +- parts/scenes/main.lua | 2 +- parts/scenes/net_menu.lua | 2 +- parts/scenes/net_rooms.lua | 2 +- parts/tick.lua | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/parts/globalTables.lua b/parts/globalTables.lua index ba6da856..04715a28 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -143,7 +143,7 @@ PATH={--Network API paths users="/users", auth="/auth", access="/auth/access", - versus="/online/versus", + rooms="/online/rooms", chat="/chat", } diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 055efa60..6f1e450b 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -243,7 +243,7 @@ return{ restart="Retry (R)", quit="Quit (Q)", }, - net_menumenu={ + net_menu={ ffa="FFA", rooms="Rooms", chat="Chat", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 89e2183a..4958ed53 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -222,7 +222,7 @@ return{ restart="Réessayer (R)", quit="Quitter (Q)", }, - net_menumenu={ + net_menu={ -- ffa="FFA", -- rooms="Rooms", -- chat="Chat", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 9dc16747..ea6e454e 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -226,7 +226,7 @@ return{ restart="Reiniciar (R)", quit= "Finalizar (Q)", }, - net_menumenu={ + net_menu={ -- ffa="FFA", -- rooms="Rooms", -- chat="Chat", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 4707e793..2c86aa8f 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -246,7 +246,7 @@ return{ restart="重新开始(R)", quit= "退出(Q)", }, - net_menumenu={ + net_menu={ ffa="FFA", rooms="房间列表", chat="聊天室", diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index 4473dd30..d1b2f5fc 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -8,7 +8,7 @@ local function tick_httpREQ_checkAccessToken(task) if response then if response.code==200 then LOG.print(text.accessSuccessed) - SCN.go("net_menumenu") + SCN.go("net_menu") elseif response.code==403 or response.code==401 then httpRequest( TICK.httpREQ_getAccessToken, diff --git a/parts/scenes/net_menu.lua b/parts/scenes/net_menu.lua index 21f9ccc8..2fde18da 100644 --- a/parts/scenes/net_menu.lua +++ b/parts/scenes/net_menu.lua @@ -6,7 +6,7 @@ end scene.widgetList={ WIDGET.newButton{name="ffa", x=640, y=200,w=350,h=120,font=40,code=NULL}, - WIDGET.newButton{name="rooms", x=640, y=360,w=350,h=120,font=40,code=WIDGET.lnk_goScene("net_menurooms")}, + WIDGET.newButton{name="rooms", x=640, y=360,w=350,h=120,font=40,code=WIDGET.lnk_goScene("net_rooms")}, WIDGET.newButton{name="chat", x=640, y=540,w=350,h=120,font=40,code=WIDGET.lnk_goScene("chat")}, WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK}, } diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index 9f709510..edd56f3c 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -37,7 +37,7 @@ local function fresh() rooms=nil httpRequest( task_fetchRooms, - PATH.api..PATH.access, + PATH.api..PATH.rooms, "GET" ) end diff --git a/parts/tick.lua b/parts/tick.lua index 6db7874f..ab24519e 100644 --- a/parts/tick.lua +++ b/parts/tick.lua @@ -11,7 +11,7 @@ function Tick.httpREQ_getAccessToken(task) LOG.print(text.accessSuccessed) USER.access_token=res.access_token FILE.save(USER,"conf/user") - SCN.swapTo("net_menumenu") + SCN.swapTo("net_menu") else LOG.print(text.netErrorCode..response.code..": "..res.message,"warn") end