From b0acdce2949626f34527ed5b792ca57aef7ed9f0 Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Mon, 24 Oct 2022 14:05:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E5=90=8C=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=AF=B9=E5=B1=80sid=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/modes/netBattle.lua | 4 ++++
 parts/net.lua             | 4 +++-
 parts/netPlayer.lua       | 5 -----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/parts/modes/netBattle.lua b/parts/modes/netBattle.lua
index 51e82661..73062090 100644
--- a/parts/modes/netBattle.lua
+++ b/parts/modes/netBattle.lua
@@ -19,6 +19,7 @@ return{
         GAME.modeEnv.task=marginTask
 
         local L=TABLE.shift(NETPLY.list,0)
+        table.sort(L,function(a,b) return a.uid<b.uid end)
         math.randomseed(GAME.seed)
         for i=#L,1,-1 do
             table.insert(NETPLY.list,table.remove(NETPLY.list,math.random(i)))
@@ -43,5 +44,8 @@ return{
                 N=N+1
             end
         end
+        for i=1,#PLY_ALIVE do
+            MES.new('info',PLY_ALIVE[i].uid.." "..PLY_ALIVE[i].sid,5)
+        end
     end,
 }
diff --git a/parts/net.lua b/parts/net.lua
index 1787d2a9..b173e507 100644
--- a/parts/net.lua
+++ b/parts/net.lua
@@ -660,7 +660,9 @@ function NET.wsCallBack.room_remove()
     _playerLeaveRoom(USER.uid)
 end
 function NET.wsCallBack.player_updateConf(body)
-    NETPLY.map[body.data.playerId].config=body.data.config
+    if type(body.data)=='table' then
+        NETPLY.map[body.data.playerId].config=body.data.config
+    end
 end
 function NET.wsCallBack.player_finish(body)-- TODO
 end
diff --git a/parts/netPlayer.lua b/parts/netPlayer.lua
index a7709b87..e193749d 100644
--- a/parts/netPlayer.lua
+++ b/parts/netPlayer.lua
@@ -139,11 +139,6 @@ function NETPLY.setStat(uid,S)
         adpm=("%.1f %s"):format((S.atk+S.dig)/S.time*60,text.radarData[2]),
     }
 end
-function NETPLY.resetState()
-    for i=1,#PLYlist do
-        PLYlist[i].playMode=0
-    end
-end
 
 local selP,mouseX,mouseY
 function NETPLY.mouseMove(x,y)