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

Merge branch 'eventsystem2'

Browse Source
This commit is contained in:
MrZ_26
2024-08-10 18:55:05 +08:00
parent 97e17edfae 49f1b747b2
commit b73a653332
1 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
parts/player/player.lua
View File

@@ -716,23 +716,24 @@ function Player:extraEvent(eventName,...)
return
end
-- Write to stream
if self.type=='human' then
ins(GAME.rep,self.frameRun)
ins(GAME.rep,64+eventID)
ins(GAME.rep,self.sid)
local data={...}
for i=1,#data do
ins(GAME.rep,data[i])
end
end
local SELF
-- Trigger for all non-remote players
for _,p in next,PLAYERS do
if p.type~='remote' then
if p.type=='human' then
SELF=p
end
self.gameEnv.extraEventHandler[eventName](p,self,...)
end
end
ins(GAME.rep,SELF.frameRun)
ins(GAME.rep,64+eventID)
ins(GAME.rep,self.sid)
local data={...}
for i=1,#data do
ins(GAME.rep,data[i])
end
end
function Player:getHolePos()-- Get a good garbage-line hole position
@@ -2731,30 +2732,14 @@ local function update_streaming(P)
P.streamProgress=P.streamProgress+eventParamCount+1
local SRC
local SELF
for _,p in next,PLAYERS do
if P==sourceSid and p.sid==sourceSid then
if p.sid==sourceSid then
SRC=p
break
end
end
if SRC then
for _,p in next,PLAYERS do
if p.type=='human' then
SELF=p
break
end
end
SELF.gameEnv.extraEventHandler[eventName](SRC,SELF,unpack(paramList))
-- Write to stream
if SELF.type=='human' then
ins(GAME.rep,SELF.frameRun)
ins(GAME.rep,event)
ins(GAME.rep,SELF.sid)
for i=1,#paramList do
ins(GAME.rep,paramList[i])
end
end
P.gameEnv.extraEventHandler[eventName](P,SRC,unpack(paramList))
end
end
P.streamProgress=P.streamProgress+2
@@ -2817,7 +2802,7 @@ function Player:update(dt)
end
while self.trigFrame>=1 do
if self.streamProgress then
local frameDelta-- Time between now and end of stream
local dataDelta=0 -- How much data wating to be process
if self.type=='remote' then
if self.loseTimer then
self.loseTimer=self.loseTimer-1
@@ -2826,25 +2811,24 @@ function Player:update(dt)
self:lose(true)
end
end
frameDelta=(self.stream[#self.stream-1] or 0)-self.frameRun
if frameDelta==0 then frameDelta=nil end
else
frameDelta=0
dataDelta=#self.stream-self.streamProgress
end
if frameDelta then
if dataDelta>0 then
for _=1,
self.loseTimer and min(frameDelta,
-- Speed up to finish
self.loseTimer and min(dataDelta,
self.loseTimer>16 and 2 or
self.loseTimer>6.2 and 12 or
self.loseTimer>2.6 and 260 or
2600
) or
frameDelta<26 and 1 or
frameDelta<50 and 2 or
frameDelta<80 and 3 or
frameDelta<120 and 5 or
frameDelta<160 and 7 or
frameDelta<200 and 10 or
-- Chasing faster when slower
dataDelta<26 and 1 or
dataDelta<42 and 2 or
dataDelta<62 and 3 or
dataDelta<70.23 and 5 or
dataDelta<94.2 and 7 or
dataDelta<126 and 10 or
20
do
update_streaming(self)