调整倒计时和连击的乐器和interior语言设置菜单的按钮样式

26F-Studio · Oct 29, 2024 · aa1e57a · aa1e57a
1 parent 5bfca72
commit aa1e57a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/assets/gamefunc.lua b/assets/gamefunc.lua
@@ -140,25 +140,25 @@ end
 
 function gameSoundFunc.countDown(num)
     if num==0 then -- 6, 3+6+6
-        playSample('organ',{'A3',.8})
+        playSample('complex',{'A3',.8})
         playSample('square',{'A4',.9},{'E5',.9},{'A5',.9})
     elseif num==1 then -- 5, 3+7
-        playSample('organ',{'G3',.9})
+        playSample('complex',{'G3',.9})
         playSample('square',{'B4',.9},{'E5',.9})
     elseif num==2 then -- 4, 6+2
-        playSample('organ',{'F3'})
+        playSample('complex',{'F3'})
         playSample('square',{'A4',.8},{'D5',.8})
     elseif num==3 then -- 6+6
-        playSample('organ',{'A3',.9},{'E4',.9})
+        playSample('complex',{'A3',.9},{'E4',.9})
         playSample('square',{'A4',.8})
     elseif num==4 then -- 5+7, 5
-        playSample('organ',{'G3',.9},{'B3',.9})
+        playSample('complex',{'G3',.9},{'B3',.9})
         playSample('square',{'G4',.6})
     elseif num==5 then -- 4+6, 4
-        playSample('organ',{'F3',.8},{'A3',.8})
+        playSample('complex',{'F3',.8},{'A3',.8})
         playSample('square',{'F4',.3})
     elseif num<=10 then
-        playSample('organ',{'A2',2.2-num/5},{'E3',2.2-num/5})
+        playSample('complex',{'A2',2.2-num/5},{'E3',2.2-num/5})
     end
 end
 function gameSoundFunc.clear(lines)
@@ -182,31 +182,31 @@ function gameSoundFunc.charge(lv)
     FMOD.effect('charge_'..MATH.clamp(math.floor(lv),1,11))
 end
 gameSoundFunc.combo=setmetatable({__register=true,
-    function() playSample('organ',{'A2',.70,420}) end, -- 1
-    function() playSample('organ',{'C3',.75,410}) end, -- 2
-    function() playSample('organ',{'D3',.80,400}) end, -- 3
-    function() playSample('organ',{'E3',.85,390}) end, -- 4
-    function() playSample('organ',{'G3',.90,380}) end, -- 5
-    function() playSample('organ',{'A3',.90,370},'square',{'A2',.20,420,620}) end, -- 6
-    function() playSample('organ',{'C4',.75,360},'square',{'C3',.40,400,620}) end, -- 7
-    function() playSample('organ',{'D4',.60,350},'square',{'D3',.60,380,620}) end, -- 8
-    function() playSample('organ',{'E4',.40,340},'square',{'E3',.75,360,620}) end, -- 9
-    function() playSample('organ',{'G4',.20,330},'square',{'G3',.90,340,620}) end, -- 10
-    function() playSample('organ',{'A4',.20,320},'square',{'A3',.85,320,620}) end, -- 11
-    function() playSample('organ',{'A4',.40,310},'square',{'C4',.80,300,620}) end, -- 12
-    function() playSample('organ',{'A4',.60,300},'square',{'D4',.75,280,620}) end, -- 13
-    function() playSample('organ',{'A4',.75,290},'square',{'E4',.70,270,620}) end, -- 14
-    function() playSample('organ',{'A4',.90,280},'square',{'G4',.65,260,640}) end, -- 15
-    function() playSample('organ',{'A4',.90,270},{'E5',.70},'square',{'A4',1,250,660}) end, -- 16
-    function() playSample('organ',{'A4',.85,260},{'E5',.75},'square',{'C5',1,240,680}) end, -- 17
-    function() playSample('organ',{'A4',.80,250},{'E5',.80},'square',{'D5',1,230,700}) end, -- 18
-    function() playSample('organ',{'A4',.75,240},{'E5',.85},'square',{'E5',1,220,720}) end, -- 19
-    function() playSample('organ',{'A4',.70,230},{'E5',.90},'square',{'G5',1,210,740}) end, -- 20
+    function() playSample('complex',{'A2',.70,420}) end, -- 1
+    function() playSample('complex',{'C3',.75,410}) end, -- 2
+    function() playSample('complex',{'D3',.80,400}) end, -- 3
+    function() playSample('complex',{'E3',.85,390}) end, -- 4
+    function() playSample('complex',{'G3',.90,380}) end, -- 5
+    function() playSample('complex',{'A3',.90,370},'square',{'A2',.20,420,620}) end, -- 6
+    function() playSample('complex',{'C4',.75,360},'square',{'C3',.40,400,620}) end, -- 7
+    function() playSample('complex',{'D4',.60,350},'square',{'D3',.60,380,620}) end, -- 8
+    function() playSample('complex',{'E4',.40,340},'square',{'E3',.75,360,620}) end, -- 9
+    function() playSample('complex',{'G4',.20,330},'square',{'G3',.90,340,620}) end, -- 10
+    function() playSample('complex',{'A4',.20,320},'square',{'A3',.85,320,620}) end, -- 11
+    function() playSample('complex',{'A4',.40,310},'square',{'C4',.80,300,620}) end, -- 12
+    function() playSample('complex',{'A4',.60,300},'square',{'D4',.75,280,620}) end, -- 13
+    function() playSample('complex',{'A4',.75,290},'square',{'E4',.70,270,620}) end, -- 14
+    function() playSample('complex',{'A4',.90,280},'square',{'G4',.65,260,640}) end, -- 15
+    function() playSample('complex',{'A4',.90,270},{'E5',.70},'square',{'A4',1,250,660}) end, -- 16
+    function() playSample('complex',{'A4',.85,260},{'E5',.75},'square',{'C5',1,240,680}) end, -- 17
+    function() playSample('complex',{'A4',.80,250},{'E5',.80},'square',{'D5',1,230,700}) end, -- 18
+    function() playSample('complex',{'A4',.75,240},{'E5',.85},'square',{'E5',1,220,720}) end, -- 19
+    function() playSample('complex',{'A4',.70,230},{'E5',.90},'square',{'G5',1,210,740}) end, -- 20
 },{__call=function(self,combo)
     if self[combo] then
         self[combo]()
     else
-        playSample('organ',{'A4',.626-.01*combo,430-10*combo})
+        playSample('complex',{'A4',.626-.01*combo,430-10*combo})
         local phase=(combo-21)%12
         playSample('square',{40+phase,1-((11-phase)/12)^2,400-10*combo,700+20*combo}) -- E4+
         playSample('square',{45+phase,1-((11-phase)/12)^2,400-10*combo,700+20*combo}) -- A4+

diff --git a/assets/scene/lang_in.lua b/assets/scene/lang_in.lua
@@ -92,7 +92,7 @@ scene.widgetList={
     {type='button_fill',    x=350,y=610,w=390,h=100,lineWidth=4,cornerR=0,fontSize=35, text='',          color='K'},
     {type='button_fill',    x=350,y=760,w=390,h=100,lineWidth=4,cornerR=0,fontSize=35, text='',          color='G'},
 
-    {type='button_fill',    x=800,y=310,w=390,h=100,lineWidth=4,cornerR=0,fontSize=40, text=langList.it, color='O', sound_trigger='check_on',code=function() _setLang('it') end},
+    {type='button',         x=800,y=310,w=390,h=100,lineWidth=4,cornerR=0,fontSize=40, text=langList.it, color='O', sound_trigger='check_on',code=function() _setLang('it') end},
     {type='button_fill',    x=800,y=460,w=390,h=100,lineWidth=4,cornerR=0,fontSize=40, text='',          color='A'},
     {type='button_fill',    x=800,y=610,w=390,h=100,lineWidth=4,cornerR=0,fontSize=40, text='',          color='J'},
     {type='button_fill',    x=800,y=760,w=390,h=100,lineWidth=4,cornerR=0,fontSize=40, text='',          color='P'},