修各种音高问题

框架跟进

Author: MrZ626

Zenitha

@@ -69,10 +69,10 @@ function playSample(...)
             local len=l[i][3] or 420
             local rel=l[i][4] or 620
             local event=FMOD.effect(inst,{
-                tune=note>=0 and note-26 or nil,
+                tune=note>=0 and note-50 or nil,
                 pitch=note<0 and -note or nil,
                 volume=vol,
-                param={'release',rel*1.0594630943592953^(note-26)},
+                param={'release',rel*1.0594630943592953^(note-50)},
             })
             if not event then return end
             TASK.new(function()
@@ -208,10 +208,10 @@ gameSoundFunc.combo=setmetatable({__register=true,
     else
         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+
-        playSample('square',{52+phase,1-(phase/12)^2,400-10*combo,700+20*combo}) -- E5+
-        playSample('square',{57+phase,1-(phase/12)^2,400-10*combo,700+20*combo}) -- A5+
+        playSample('square',{16+phase,1-((11-phase)/12)^2,400-10*combo,700+20*combo}) -- E4+
+        playSample('square',{21+phase,1-((11-phase)/12)^2,400-10*combo,700+20*combo}) -- A4+
+        playSample('square',{28+phase,1-(phase/12)^2,400-10*combo,700+20*combo}) -- E5+
+        playSample('square',{33+phase,1-(phase/12)^2,400-10*combo,700+20*combo}) -- A5+
     end
 end,__metatable=true})
 gameSoundFunc.chain=gameSoundFunc.combo

assets/gamefunc.lua

@@ -58,29 +58,29 @@ local dialModeData={
         ['#']={text='#',notes={{-941/220,1,160,62},{-1477/220,1,160,62}}},
     },
     chord={
-        ['1']={text='D' ,notes={{'F#4',1,355,2600},{'A4',1,355,2600},{'D5',1,355,2600}}},
-        ['2']={text='C' ,notes={{'G4',1,355,2600},{'C5',1,355,2600},{'E5',1,355,2600}}},
-        ['3']={text='A' ,notes={{'A4',1,355,2600},{'C#5',1,355,2600},{'E5',1,355,2600}}},
-        ['4']={text='F' ,notes={{'F4',1,355,2600},{'A4',1,355,2600},{'C5',1,355,2600}}},
-        ['5']={text='G' ,notes={{'G4',1,355,2600},{'B4',1,355,2600},{'D5',1,355,2600}}},
-        ['6']={text='Am',notes={{'A4',1,355,2600},{'C5',1,355,2600},{'E5',1,355,2600}}},
-        ['7']={text='Dm',notes={{'F4',1,355,2600},{'A4',1,355,2600},{'D5',1,355,2600}}},
-        ['8']={text='Em',notes={{'G4',1,355,2600},{'B4',1,355,2600},{'E5',1,355,2600}}},
-        ['9']={text='E' ,notes={{'G#4',1,355,2600},{'B4',1,355,2600},{'E5',1,355,2600}}},
+        ['1']={text='D' ,notes={{'F#3',1,355,2600},{'A3',1,355,2600},{'D4',1,355,2600}}},
+        ['2']={text='C' ,notes={{'G3',1,355,2600},{'C4',1,355,2600},{'E4',1,355,2600}}},
+        ['3']={text='A' ,notes={{'A3',1,355,2600},{'C#4',1,355,2600},{'E4',1,355,2600}}},
+        ['4']={text='F' ,notes={{'F3',1,355,2600},{'A3',1,355,2600},{'C4',1,355,2600}}},
+        ['5']={text='G' ,notes={{'G3',1,355,2600},{'B3',1,355,2600},{'D4',1,355,2600}}},
+        ['6']={text='Am',notes={{'A3',1,355,2600},{'C4',1,355,2600},{'E4',1,355,2600}}},
+        ['7']={text='Dm',notes={{'F3',1,355,2600},{'A3',1,355,2600},{'D4',1,355,2600}}},
+        ['8']={text='Em',notes={{'G3',1,355,2600},{'B3',1,355,2600},{'E4',1,355,2600}}},
+        ['9']={text='E' ,notes={{'G#3',1,355,2600},{'B3',1,355,2600},{'E4',1,355,2600}}},
         ['*']={text='Inst.'},
         ['0']={text='8va'},
         ['#']={text='Notes'},
     },
     simple={
-        ['1']={text='F4',notes={{'F4',1,260,1260}}},
-        ['2']={text='G4',notes={{'G4',1,260,1260}}},
-        ['3']={text='A4',notes={{'A4',1,260,1260}}},
-        ['4']={text='B4',notes={{'B4',1,260,1260}}},
-        ['5']={text='C5',notes={{'C5',1,260,1260}}},
-        ['6']={text='D5',notes={{'D5',1,260,1260}}},
-        ['7']={text='E5',notes={{'E5',1,260,1260}}},
-        ['8']={text='F5',notes={{'F5',1,260,1260}}},
-        ['9']={text='G5',notes={{'G5',1,260,1260}}},
+        ['1']={text='F3',notes={{'F3',1,260,1260}}},
+        ['2']={text='G3',notes={{'G3',1,260,1260}}},
+        ['3']={text='A3',notes={{'A3',1,260,1260}}},
+        ['4']={text='B3',notes={{'B3',1,260,1260}}},
+        ['5']={text='C4',notes={{'C4',1,260,1260}}},
+        ['6']={text='D4',notes={{'D4',1,260,1260}}},
+        ['7']={text='E4',notes={{'E4',1,260,1260}}},
+        ['8']={text='F4',notes={{'F4',1,260,1260}}},
+        ['9']={text='G4',notes={{'G4',1,260,1260}}},
         ['*']={text='Inst.'},
         ['0']={text='8va'},
         ['#']={text='Chords'},
@@ -101,7 +101,6 @@ local codes={
     '7126',
     '63232',
     '6323',
-    '123456',
     '1155665',
     '1235789',
     '22884646',
@@ -144,7 +143,7 @@ function scene.load()
     rec,recTimer='',2.6
     if SCN.stackChange>0 then
         dialMode,transTimer=false,PROGRESS.getSecret('dial_enter') and 6.26 or 26
-        mode,instrument,octave_plus='normal','organ',false
+        mode,instrument,octave_plus='normal','complex',false
     end
     scene.widgetList.musicroom:setVisible(mode~='normal' and mode~='dial')
     BG.set('none')