From c752556bf307a29a572d39ae57ddc21ea601940f Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Thu, 18 Nov 2021 03:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83pc=E8=81=94=E7=B3=BB=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E5=B7=A6=E4=BE=A7=E4=BF=A1=E6=81=AF=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=20=E7=BB=A7=E7=BB=AD=E6=8E=A8=E8=BF=9B=E5=A4=A7=E7=88=86?=
 =?UTF-8?q?=E7=82=B8=E6=A8=A1=E5=BC=8F=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/eventsets/bigbang.lua   | 32 +++++++++++++-------------------
 parts/eventsets/pctrain_l.lua |  4 ++--
 parts/eventsets/pctrain_n.lua |  4 ++--
 parts/modes/bigbang.lua       |  4 ++--
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/parts/eventsets/bigbang.lua b/parts/eventsets/bigbang.lua
index e706d051..12d40afc 100644
--- a/parts/eventsets/bigbang.lua
+++ b/parts/eventsets/bigbang.lua
@@ -1,41 +1,35 @@
-local function task_newBoard(P)
-    local F,L={},{}
+local function task_newBoard(P,init)
+    local F,L={},{1}
     --TODO
     P:pushNextList(L)
 
     P.control=false
-    if P.frameRun>180 then for _=1,26 do YIELD()end end
+    if not init then for _=1,26 do YIELD()end end
     P.control=true
 
+    P.gameEnv.heightLimit=#F
     P:pushLineList(F)
 end
 local function _check(P)
-    if #P.field>0 then
-        P.gameEnv.heightLimit=P.gameEnv.heightLimit-P.lastPiece.row
-        if #P.field+P.stat.row%4>4 then
-            P:lose()
-        end
-    else
-        if P.stat.pc>=100 then
+    P.gameEnv.heightLimit=P.gameEnv.heightLimit-P.lastPiece.row
+    if P.gameEnv.heightLimit==0 then
+        P.modeData.stage=P.modeData.stage+1
+        if P.modeData.stage>=100 then
             P:win('finish')
         else
             P:newTask(task_newBoard)
-            if P.frameRun<180 then P.fieldBeneath=0 end
         end
     end
 end
 return{
+    sequence='none',
+    RS="SRS",
     pushSpeed=5,
     mesDisp=function(P)
         setFont(60)
-        mStr(P.stat.pc,63,340)
-        mText(TEXTOBJ.pc,63,410)
+        mStr(P.modeData.stage,63,280)
+        mText(TEXTOBJ.wave,63,350)
     end,
     hook_drop=_check,
-    -- task=_check,--Just run one time at first to start first level
-    task=function(P)
-        P:switchKey(6,false)
-        YIELD()
-        P:lose()
-    end,
+    task=function(P)task_newBoard(P,true)P.fieldBeneath=0 end,--Just run one time at first to start first level
 }
diff --git a/parts/eventsets/pctrain_l.lua b/parts/eventsets/pctrain_l.lua
index 7156f306..2e83cf72 100644
--- a/parts/eventsets/pctrain_l.lua
+++ b/parts/eventsets/pctrain_l.lua
@@ -46,8 +46,8 @@ return{
     RS="SRS",
     mesDisp=function(P)
         setFont(60)
-        mStr(P.stat.pc,63,340)
-        mText(TEXTOBJ.pc,63,410)
+        mStr(P.stat.pc,63,260)
+        mText(TEXTOBJ.pc,63,330)
     end,
     hook_drop=_check,
     task=_check,--Just run one time at first to start first level
diff --git a/parts/eventsets/pctrain_n.lua b/parts/eventsets/pctrain_n.lua
index 4a6f0e9a..a925725b 100644
--- a/parts/eventsets/pctrain_n.lua
+++ b/parts/eventsets/pctrain_n.lua
@@ -39,8 +39,8 @@ return{
     RS="SRS",
     mesDisp=function(P)
         setFont(60)
-        mStr(P.stat.pc,63,340)
-        mText(TEXTOBJ.pc,63,410)
+        mStr(P.stat.pc,63,260)
+        mText(TEXTOBJ.pc,63,330)
     end,
     hook_drop=_check,
     task=_check,--Just run one time at first to start first level
diff --git a/parts/modes/bigbang.lua b/parts/modes/bigbang.lua
index c1df20c5..6c2d9513 100644
--- a/parts/modes/bigbang.lua
+++ b/parts/modes/bigbang.lua
@@ -6,12 +6,12 @@ return{
         eventSet='bigbang',
         bg='blockhole',bgm='peak',
     },
-    score=function(P)return{P.stat.pc,P.stat.time}end,
+    score=function(P)return{P.modeData.stage,P.stat.time}end,
     scoreDisp=function(D)return D[1].." Stage   "..STRING.time(D[2])end,
     comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
     getRank=function(P)
         do return 1 end
-        local L=P.stat.pc
+        local L=P.modeData.stage
         return
         L>=100 and 5 or
         L>=70 and 4 or