From 6519e8445ee347245d43215ab554dfd732eaf8ad Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 8 Jun 2021 12:55:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96GAME.prevBG=E7=9A=84=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E5=90=8C=E6=97=B6=E5=BA=94=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E8=81=94=E7=BD=91=E6=B8=B8=E6=88=8F=E5=9C=BA=E6=99=AF=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=8E=E8=AE=BE=E7=BD=AE=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=90=8E=E8=83=8C=E6=99=AF=E5=8F=98=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/scenes/net_game.lua | 5 +++++ parts/scenes/pause.lua | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index db664eb9..2f10462e 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -26,6 +26,7 @@ local function _setReady()NET.signal_setMode(1)end local function _setSpectate()NET.signal_setMode(2)end local function _gotoSetting() if not(netPLY.getSelfReady()or NET.getlock('ready'))then + GAME.prevBG=BG.cur SCN.go('setting_game') end end @@ -63,6 +64,10 @@ function scene.sceneInit(org) newMessageTimer=0 if org=='setting_game'then NET.changeConfig()end + if GAME.prevBG then + BG.set(GAME.prevBG) + GAME.prevBG=false + end if NET.specSRID then NET.wsconn_stream(NET.specSRID) NET.specSRID=false diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index f4fd689b..2062508a 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -113,8 +113,9 @@ function scene.sceneInit(org) else rank,trophy=nil end - if org~="game"and GAME.prevBG then + if GAME.prevBG then BG.set(GAME.prevBG) + GAME.prevBG=false end end function scene.sceneBack()