框架跟进

推进中途加入房间的观战相关

parts/scenes/error.lua

@@ -6,7 +6,7 @@ local scene={}
 
 function scene.sceneInit()
     BGcolor=math.random()>.026 and{.3,.5,.9} or{.62,.3,.926}
-    sysAndScn=SYSTEM.."-"..VERSION.string.."       scene:"..Z.getErr('#').scene
+    sysAndScn=SYSTEM.."-"..VERSION.string.."    scene:"..Z.getErr('#').scene
     errorText=LOADED and text.errorMsg or "An error has occurred while the game was loading.\nAn error log has been created so you can send it to the author."
     errorShot,errorInfo=Z.getErr('#').shot,Z.getErr('#').mes
     NET.ws_close()

parts/scenes/main.lua

@@ -22,7 +22,7 @@ function scene.sceneInit()
     if THEME.cur=='halloween' then
         TASK.new(function()
             TEST.yieldT(.26)
-            while SCN.stack[#SCN.stack]=='main' do
+            while SCN.current=='main' do
                 flash=.355
                 SFX.play('clear_'..math.random(4,6),1,math.random()*2-1,-9-math.random()*3)
                 TEST.yieldT(.626+math.random()*6.26)

parts/scenes/net_game.lua

@@ -247,8 +247,9 @@ function scene.update(dt)
             end
         end
     else
-        NETPLY.update(dt)
-        if TASK.getLock('netPlaying') and not playing then
+        if not TASK.getLock('netPlaying') then
+            NETPLY.update(dt)
+        else
             playing=true
             TASK.lock('netPlaying')
             lastUpstreamTime=0