From c2d29c3d6ae7e8453d3d8828da9e76479f291134 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Fri, 4 Nov 2022 17:15:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=BD=91=E6=B8=B8=E6=88=8F=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E9=80=89=E9=98=9F=E4=BC=8D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=B2=A1=E5=8D=B5?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E9=80=80=E5=87=BA=E6=88=BF=E9=97=B4=E5=91=BD?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.lua | 2 +- parts/gameTables.lua | 4 ++-- parts/scenes/net_game.lua | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/main.lua b/main.lua index 20398c71..5c69f04f 100644 --- a/main.lua +++ b/main.lua @@ -60,7 +60,7 @@ BGM.setMaxSources(5) VOC.setDiversion(.62) WIDGET.setOnChange(function() - if SCN.cur~='custom_field' then + if SCN.cur~='net_game' and SCN.cur~='custom_field' then local colorList=THEME.getThemeColor() if colorList then for _,W in next,SCN.scenes[SCN.cur].widgetList do diff --git a/parts/gameTables.lua b/parts/gameTables.lua index 79145f3a..74254a79 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -23,8 +23,8 @@ RANK_COLORS={ GROUP_COLORS={ [0]=COLOR.Z, [1]={STRING.hexColor'e57373'}, - [2]={STRING.hexColor'aed581'}, - [3]={STRING.hexColor'42a5f5'}, + [2]={STRING.hexColor"4caf50"}, + [3]={STRING.hexColor'5c6bc0'}, [4]={STRING.hexColor'ffe082'}, [5]={STRING.hexColor'ba68c8'}, [6]={STRING.hexColor'80deea'}, diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index f7202fca..48e3de19 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -140,6 +140,8 @@ function scene.keyDown(key,isRep) if tonumber(cmd[2]) and tonumber(cmd[2])%1==0 and tonumber(cmd[2])>=0 and tonumber(cmd[2])<=6 then NET.player_joinGroup(tonumber(cmd[2])) end + elseif cmd[1]=='/exit' or cmd[1]=='/quit'then + _quit() else NET.textBox:push{COLOR.R,'Invalid command'} end @@ -343,6 +345,15 @@ scene.widgetList={ WIDGET.newKey{name='ready', x=1060,y=510,w=360,h=90,color='lG',font=35, code=_setReady,hideF=_hideF_ready}, WIDGET.newKey{name='spectate',x=1060,y=610,w=360,h=90,color='lO',font=35, code=_setSpectate,hideF=_hideF_ready}, WIDGET.newKey{name='cancel', x=1060,y=560,w=360,h=120,color='lH',font=40,code=_setCancel,hideF=_hideF_standby}, + + WIDGET.newButton{x=320,y=45,w=40,color='Z', fText="",code=function() NET.player_joinGroup(0) end,hideF=_hideF_ready}, + WIDGET.newButton{x=190,y=25,w=30,color='lR',fText="",code=function() NET.player_joinGroup(1) end,hideF=_hideF_ready}, + WIDGET.newButton{x=230,y=25,w=30,color='lG',fText="",code=function() NET.player_joinGroup(2) end,hideF=_hideF_ready}, + WIDGET.newButton{x=270,y=25,w=30,color='lB',fText="",code=function() NET.player_joinGroup(3) end,hideF=_hideF_ready}, + WIDGET.newButton{x=190,y=65,w=30,color='lY',fText="",code=function() NET.player_joinGroup(4) end,hideF=_hideF_ready}, + WIDGET.newButton{x=230,y=65,w=30,color='lM',fText="",code=function() NET.player_joinGroup(5) end,hideF=_hideF_ready}, + WIDGET.newButton{x=270,y=65,w=30,color='lC',fText="",code=function() NET.player_joinGroup(6) end,hideF=_hideF_ready}, + WIDGET.newKey{name='chat', x=390,y=45,w=60,fText="ยทยทยท", code=_switchChat}, WIDGET.newKey{name='quit', x=890,y=45,w=60,font=30,fText=CHAR.icon.cross_thick,code=_quit}, }