From 80984cddf9b8080a33742dcb6d20d3efcf524788 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Sun, 23 Oct 2022 01:13:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=BD=91=E6=B8=B8=E6=88=8F=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E5=90=8E2.6=E7=A7=92=E8=BF=94=E5=9B=9E=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/net.lua | 7 +++++-- parts/player/player.lua | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/parts/net.lua b/parts/net.lua index 475bf3d0..89fbe17f 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -497,7 +497,7 @@ end function NET.player_updateConf() wsSend(actMap.player_updateConf,dumpBasicConfig()) end -function NET.player_finish(msg)-- what msg? +function NET.player_finish(msg) wsSend(actMap.player_finish,msg) end function NET.player_joinGroup(gid) @@ -620,7 +620,10 @@ function NET.wsCallBack.player_setReadyMode(body) NETPLY.setReadyMode(body.data.playerId,body.data.type) end function NET.wsCallBack.match_finish() - TASK.unlock('netPlaying') + TASK.new(function() + TEST.yieldT(2.6) + TASK.unlock('netPlaying') + end) end function NET.wsCallBack.match_ready()-- TODO end diff --git a/parts/player/player.lua b/parts/player/player.lua index 6d571db1..503c6575 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -2845,7 +2845,7 @@ function Player:lose(force) gameOver() self:newTask(#PLAYERS>1 and task_lose or task_finish) if GAME.net and not NET.spectate then - NET.player_finish() + NET.player_finish({foo="-- TODO"}) else TASK.new(task_autoPause) end