From 358190546239cefc7a1b15e632defaec03ab0a68 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Wed, 17 Feb 2021 01:11:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=83=E7=94=A8=E5=8E=9F=E6=9D=A5=E7=9A=84?= =?UTF-8?q?=E8=81=94=E7=BD=91=E5=BA=93=E5=87=BD=E6=95=B0=E5=87=86=E5=A4=87?= =?UTF-8?q?=E6=8D=A2=E6=96=B0=EF=BC=8C=E8=AE=A9=E4=B8=BB=E5=88=86=E6=94=AF?= =?UTF-8?q?=E5=8F=AF=E8=BF=90=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/globalTables.lua | 13 ------------- parts/scenes/load.lua | 2 ++ parts/scenes/login.lua | 2 ++ parts/scenes/main.lua | 2 ++ 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 47703efc..ae686457 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -140,19 +140,6 @@ for i=1,#MODOPT do M.sel,M.time=0,0 M.color=COLOR[M.color] end -PATH={--Network API paths - url="hdustea.3322.org", - port="10026", - - http="/tech/api/v1", - socket="/tech/socket/v1", - appInfo="/app/info", - user="/user", - auth="/auth/auth", - access="/auth/access", - onlineChat="/online/chat", - onlinePlay="/online/play", -} --Game tables PLAYERS={alive={}}--Players data diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index dd85856c..10bee17f 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -197,6 +197,7 @@ function scene.update() LOADED=true SFX.play("welcome_sfx") VOC.play("welcome_voc") + --[[TODO httpRequest(tick_httpREQ_launch,PATH.http..PATH.appInfo) if USER.auth_token and USER.email then httpRequest( @@ -210,6 +211,7 @@ function scene.update() } ) end + ]] if FESTIVAL=="Xmas"then LOG.print("==============",COLOR.red) LOG.print("Merry Christmas!",COLOR.white) diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua index 4c940631..c41f13c7 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -58,6 +58,7 @@ local function login() elseif #password==0 then LOG.print(text.noPassword)return end + --[[TODO httpRequest( tick_httpREQ_newLogin, PATH.http..PATH.auth, @@ -68,6 +69,7 @@ local function login() password=password, } ) + ]] end local scene={} diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index c3546591..6ef06379 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -109,6 +109,7 @@ scene.widgetList={ WIDGET.newButton{name="offline",x=150,y=220,w=200,h=140,color="lRed", font=40,code=goScene"mode"}, WIDGET.newButton{name="online", x=370,y=220,w=200,h=140,color="lCyan", font=40,code=function() if LOGIN then + --[[TODO if USER.access_token then httpRequest( tick_httpREQ_manualAutoLogin, @@ -132,6 +133,7 @@ scene.widgetList={ } ) end + ]] else SCN.go("login") end