SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复节日日期写错

Browse Source 
修正简洁模式场景栈搜索有未触发漏洞
整理代码
框架跟进
This commit is contained in:
MrZ_26
2022-11-03 15:11:12 +08:00
parent 9e882e6188
commit b2b5c99425
8 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
parts/net.lua
View File

@@ -440,7 +440,7 @@ end
--Remove player when leave
local function _playerLeaveRoom(uid)
if SCN.current=='net_game' then
if SCN.cur=='net_game' then
for i=1,#PLAYERS do if PLAYERS[i].uid==uid then table.remove(PLAYERS,i) break end end
for i=1,#PLY_ALIVE do if PLY_ALIVE[i].uid==uid then table.remove(PLY_ALIVE,i) break end end
if uid==USER.uid then
@@ -586,7 +586,7 @@ function NET.wsCallBack.global_getOnlineCount(body)
NET.onlineCount=tonumber(body.data) or "_"
end
function NET.wsCallBack.room_chat(body)
if SCN.current=='net_game' then
if SCN.cur=='net_game' then
TASK.unlock('receiveMessage')
TASK.lock('receiveMessage',1)
NET.textBox:push{
@@ -684,22 +684,22 @@ function NET.wsCallBack.room_fetch(body)
SCN.scenes.net_rooms.widgetList.roomList:setList(body.data)
end
function NET.wsCallBack.room_setPW()
if SCN.current~='net_game' then return end
if SCN.cur~='net_game' then return end
MES.new(text.roomPasswordChanged)
end
function NET.wsCallBack.room_remove()
if SCN.current~='net_game' then return end
if SCN.cur~='net_game' then return end
MES.new('info',text.roomRemoved)
_playerLeaveRoom(USER.uid)
end
function NET.wsCallBack.player_updateConf(body)
if SCN.current~='net_game' then return end
if SCN.cur~='net_game' then return end
if type(body.data)=='table' then
NETPLY.map[body.data.playerId].config=body.data.config
end
end
function NET.wsCallBack.player_finish(body)
if SCN.current~='net_game' then return end
if SCN.cur~='net_game' then return end
for _,P in next,PLY_ALIVE do
if P.uid==body.data.playerId then
P.loseTimer=26
@@ -709,11 +709,11 @@ function NET.wsCallBack.player_finish(body)
end
end
function NET.wsCallBack.player_joinGroup(body)
if SCN.current~='net_game' then return end
if SCN.cur~='net_game' then return end
NETPLY.map[body.data.playerId].group=body.data.group
end
function NET.wsCallBack.player_setHost(body)
if SCN.current~='net_game' then return end
if SCN.cur~='net_game' then return end
if body.data.role=='Admin' then
MES.new('info',text.becomeHost:repD(_getFullName(body.data.playerId)))
end
@@ -722,21 +722,21 @@ end
function NET.wsCallBack.player_setState(body)-- not used
end
function NET.wsCallBack.player_stream(body)
if SCN.current~='net_game' then return end
if SCN.cur~='net_game' then return end
_pumpStream(body.data)
end
function NET.wsCallBack.player_setPlayMode(body)
if SCN.current~='net_game' then return end
if SCN.cur~='net_game' then return end
NETPLY.map[body.data.playerId].playMode=body.data.type
NET.freshRoomAllReady()
end
function NET.wsCallBack.player_setReadyMode(body)
if SCN.current~='net_game' then return end
if SCN.cur~='net_game' then return end
NETPLY.map[body.data.playerId].readyMode=body.data.isReady and 'Ready' or 'Standby'
NET.freshRoomAllReady()
end
function NET.wsCallBack.match_finish()
if SCN.current~='net_game' then return end
if SCN.cur~='net_game' then return end
for _,P in next,PLAYERS do
NETPLY.setStat(P.uid,P.stat)
end
@@ -748,7 +748,7 @@ end
function NET.wsCallBack.match_ready()-- not used
end
function NET.wsCallBack.match_start(body)
if SCN.current~='net_game' then return end
if SCN.cur~='net_game' then return end
TASK.lock('netPlaying')
NET.seed=body.data and body.data.seed
if not NET.seed then