From 00c602c8445187da1ed0f016cadc9a13dbd3f1b5 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Wed, 3 Nov 2021 02:40:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E8=B0=83=E6=95=B4=E8=B6=85=E7=BA=A7?=
 =?UTF-8?q?=E6=B6=88=E9=99=A4=E9=9F=B3=E6=95=88=20=E8=B0=83=E6=95=B4launch?=
 =?UTF-8?q?pad?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/gameFuncs.lua        | 22 ++++++++++++++++------
 parts/scenes/launchpad.lua | 12 ++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua
index 5fb5e931..d3f1c042 100644
--- a/parts/gameFuncs.lua
+++ b/parts/gameFuncs.lua
@@ -181,14 +181,24 @@ function playClearSFX(cc)
     if cc<=4 then
         playSFX('clear_'..cc)
     elseif cc<=6 then
-        playSFX('clear_5')
+        playSFX('clear_4')
+    elseif cc<=12 then
+        playSFX('clear_4',.8)
+        if cc<=9 then
+            Snd('bass','A3','E4')
+        else
+            Snd('bass','A3','E4','A4')
+        end
+    elseif cc<=16 then
+        playSFX('clear_5',.7)
+        if cc<=14 then
+            Snd('bass',.8,'A3','E4')Snd('lead','A4','E5')
+        else
+            Snd('bass',.8,'A3','G4')Snd('lead','B4','G5')
+        end
     else
         playSFX('clear_6',.6)
-        if cc<=9 then      Snd('bass','A3','E4')
-        elseif cc<=12 then Snd('bass','A3','E4','A4')
-        elseif cc<=14 then Snd('bass',.8,'A3','E4')Snd('lead','A4','E5')
-        elseif cc<=16 then Snd('bass',.8,'A3','G4')Snd('lead','B4','G5')
-        elseif cc==17 then Snd('bass',.8,'A3','A4')Snd('lead','E5','G5')
+        if cc==17 then Snd('bass',.8,'A3','A4')Snd('lead','E5','G5')
         elseif cc==18 then Snd('bass',.7,'A4')Snd('lead',.8,'C4','G5')Snd('bell','D5')
         elseif cc==19 then Snd('bass',.7,'A4')Snd('lead',.8,'A4','E5')Snd('bell','B5')
         elseif cc==20 then Snd('bass',.7,'A4')Snd('lead',.8,'A4','E4')Snd('bell','D5','B5','G6')
diff --git a/parts/scenes/launchpad.lua b/parts/scenes/launchpad.lua
index 18e1d3e1..a3f4119b 100644
--- a/parts/scenes/launchpad.lua
+++ b/parts/scenes/launchpad.lua
@@ -50,8 +50,8 @@ pad={x=140,y=65,page=1,
             {samp={tag='clear_2',func=function()playClearSFX(2)end}},
             {samp={tag='clear_3',func=function()playClearSFX(3)end}},
             {samp={tag='clear_4',func=function()playClearSFX(4)end}},
-            {samp={tag='clear_5',func=function()playClearSFX(5)end}},
-            {samp={tag='clear_6',func=function()playClearSFX(6)end}},
+            {samp={tag='clear_7',func=function()playClearSFX(7)end}},
+            {samp={tag='clear_10',func=function()playClearSFX(10)end}},
         },
         {{sfx='prerotate'},   {sfx='rotate'},           {sfx='rotatekick'}, {},              {voc='single'}, {voc='double'}, {voc='triple'}, {voc='techrash'}},
         {{sfx='finesseError'},{sfx='finesseError_long'},{sfx='drop_cancel'},{},              {sfx='spin_0'}, {sfx='spin_1'}, {sfx='spin_2'}, {sfx='spin_3'}},
@@ -84,8 +84,8 @@ pad={x=140,y=65,page=1,
             {samp={tag='clear_2',func=function()playClearSFX(2)end}},
             {samp={tag='clear_3',func=function()playClearSFX(3)end}},
             {samp={tag='clear_4',func=function()playClearSFX(4)end}},
-            {samp={tag='clear_5',func=function()playClearSFX(5)end}},
-            {samp={tag='clear_6',func=function()playClearSFX(6)end}},
+            {samp={tag='clear_7',func=function()playClearSFX(7)end}},
+            {samp={tag='clear_10',func=function()playClearSFX(10)end}},
         },
         {{voc='mini'},   {voc='b2b'},    {voc='b3b'},   {voc='perfect_clear'}, {voc='half_clear'},        {sfx='finesseError'},     {sfx='finesseError_long'}, {sfx='drop_cancel'},},
         {{voc='zspin'},  {voc='sspin'},  {voc='jspin'}, {voc='lspin'},         {voc='tspin'},             {voc='ospin'},            {voc='ispin'},             {}},
@@ -253,12 +253,12 @@ function scene.draw()
         gc_rectangle('line',x*80+2,(y-1)*80+2,76,76,5)
         local k=pad[pad.page][y][x]
         if showLabel then
-            if k.sfx then mStr(k.sfx,x*80+40,y*80-30)gc_circle('fill',x*80+40,(y-1)*80+40,6)end
+            if k.sfx then mStr(k.sfx,x*80+40,y*80-30)gc_circle('line',x*80+40,(y-1)*80+40,5)end
             if k.voc then mStr(k.voc,x*80+40,y*80-17)gc_rectangle('line',x*80+30,(y-1)*80+30,20,20,1)end
             if k.samp then mStr(k.samp.tag,x*80+40,y*80-30)gc_rectangle('fill',x*80+10,(y-1)*80+35,60,5,1)end
             if k.bgm then mStr(k.bgm,x*80+40,y*80-78)gc_rectangle('fill',x*80+20,(y-1)*80+15,40,5,2)end
         else
-            if k.sfx then gc_circle('fill',x*80+40,(y-1)*80+40,6)end
+            if k.sfx then gc_circle('line',x*80+40,(y-1)*80+40,5)end
             if k.voc then gc_rectangle('line',x*80+30,(y-1)*80+30,20,20,1)end
             if k.samp then gc_rectangle('fill',x*80+10,(y-1)*80+35,60,5,1)end
             if k.bgm then gc_rectangle('fill',x*80+20,(y-1)*80+15,40,5,2)end