Merge pull request '整理 #3 提到的 1,1,1,X 不规律问题' (#4) from patch-2 into master

Reviewed-on: #4
This commit is contained in:
tls 2022-08-18 14:42:55 +00:00
commit f42e8c5056
1 changed files with 17 additions and 22 deletions

View File

@ -222,28 +222,22 @@
{ "bar": 38, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 38, "beat": 3, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 38, "beat": 3, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 38, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 38, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 38, "beat": 5, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 38, "beat": 7, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 38, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 38, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 39, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 39, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 39, "beat": 3, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 39, "beat": 3, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 39, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 39, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 39, "beat": 5, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 39, "beat": 7, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 39, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 39, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 40, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 40, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 40, "beat": 3, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 40, "beat": 3, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 40, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 40, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 40, "beat": 5, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 40, "beat": 7, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 40, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 40, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 41, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 41, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
@ -257,10 +251,8 @@
{ "bar": 42, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 42, "beat": 3, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 42, "beat": 3, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 42, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 42, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 42, "beat": 5, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 42, "beat": 7, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 42, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 42, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 43, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "tick": 1 },
{ "bar": 43, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
@ -346,11 +338,12 @@
{ "bar": 61, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 61, "beat": 6, "y": 1, "type": "SayReadyGetSetGo", "active": false, "phraseToSay": "JustSayStop", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 61, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 62, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 3, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 62, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 62, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 1, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 62, "beat": 3, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 62, "beat": 5, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 62, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 62, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 62, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "active": false, "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 62, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 63, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 1, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 63, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
@ -359,11 +352,12 @@
{ "bar": 63, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 63, "beat": 6, "y": 1, "type": "SayReadyGetSetGo", "active": false, "phraseToSay": "JustSayStop", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 63, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 64, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 3, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 64, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 64, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 1, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 64, "beat": 3, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 64, "beat": 5, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 64, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 64, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 64, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "active": false, "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 64, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 65, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 1, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 65, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
@ -379,11 +373,12 @@
{ "bar": 66, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 66, "beat": 6, "y": 1, "type": "SayReadyGetSetGo", "active": false, "phraseToSay": "JustSayStop", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 66, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 67, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 3, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 67, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 67, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 1, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 67, "beat": 3, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 67, "beat": 5, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 67, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 67, "beat": 5, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 67, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "active": false, "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 67, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 68, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 2, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 68, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
@ -443,17 +438,17 @@
{ "bar": 87, "beat": 5, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 87, "beat": 6, "y": 1, "type": "SayReadyGetSetGo", "active": false, "phraseToSay": "JustSayStop", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 87, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 88, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 3, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 88, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 2, "interval": 2, "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 88, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 88, "beat": 3, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 88, "beat": 5, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 88, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 88, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "active": false, "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 88, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 89, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 3, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 89, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 2, "interval": 2, "squareSound": true, "skipshot": true, "tick": 1 },
{ "bar": 89, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 89, "beat": 3, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 89, "beat": 5, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 89, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 89, "beat": 7, "y": 1, "type": "SayReadyGetSetGo", "active": false, "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 89, "beat": 8, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "JustSaySet", "voiceSource": "Nurse", "tick": 1, "volume": 100 },
{ "bar": 90, "beat": 1, "y": 0, "type": "AddOneshotBeat", "row": 3, "pulseType": "Square", "loops": 2, "interval": 2, "squareSound": true, "tick": 1 },
{ "bar": 90, "beat": 1, "y": 1, "type": "SayReadyGetSetGo", "phraseToSay": "Count1", "voiceSource": "Nurse", "tick": 1, "volume": 100 },