Merge remote-tracking branch 'origin/master' into lip-sync

This commit is contained in:
Jáchym Toušek
2018-01-21 14:35:29 +01:00
6 changed files with 41 additions and 5 deletions

View File

@@ -258,7 +258,7 @@ void main()
DisableWindow();
FadeOutBGM( 1, 1000, TRUE );
FadeOutBGM( 2, 1000, TRUE );
PlaySE( 4, "wa013", 128, 64 );
PlaySE( 4, "wa_013", 128, 64 );
DrawScene( "white", 10 );
DrawScene( "bg_165", 50 );
ModDrawCharacterWithFiltering(3, 11, "character/normal/oisi1_1_", "0", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );

View File

@@ -5,6 +5,25 @@ void main()
//■沢のほとりにて…昔話
////*Onikakusi_day9_2
DrawScene( "monologue_oni1", 1000 );
PlayVoice(3, "s00/n/oni001", 256);
Wait( 4000 );
PlayVoice(3, "s00/n/oni002", 256);
Wait( 4000 );
PlayVoice(3, "s00/n/oni003", 256);
Wait( 10000 );
DrawScene( "monologue_oni2", 1000 );
PlayVoice(3, "s00/n/oni004", 256);
Wait( 5000 );
PlayVoice(3, "s00/n/oni005", 256);
Wait( 5000 );
PlayVoice(3, "s00/n/oni007", 256);
Wait( 2000 );
PlayVoice(3, "s00/n/oni008", 256);
Wait( 3000 );
PlayVoice(3, "s00/n/oni009", 256);
Wait( 7000 );
PlayBGM( 1, "msys13", 128, 0 );
PlayBGM( 2, "lsys19", 128, 0 );

View File

@@ -159,7 +159,7 @@ void main()
NULL, " You might not know this...", Line_WaitForInput);
PlaySE( 4, "wa__024", 128, 64 );
PlaySE( 4, "wa_024", 128, 64 );
//実はあいつ、オヤシロさまの使いなんだよ。@
ModPlayVoiceLS(3, 3, "s20/03/440300039", 256, TRUE);

View File

@@ -159,15 +159,15 @@ void main()
FadeOutBGM( 1, 1000, TRUE );
FadeOutBGM( 2, 1000, TRUE );
PlaySE( 4, "wa__011", 128, 64 );
PlaySE( 4, "wa_011", 128, 64 );
SetValidityOfInput( FALSE );
Wait( 400 );
SetValidityOfInput( TRUE );
PlaySE( 4, "wa__010", 128, 64 );
PlaySE( 4, "wa_010", 128, 64 );
SetValidityOfInput( FALSE );
Wait( 400 );
SetValidityOfInput( TRUE );
PlaySE( 4, "wa__029", 128, 64 );
PlaySE( 4, "wa_029", 128, 64 );
//...ですがその前にコマーシャル!!¥
ModPlayVoiceLS(3, 0, "s20/00/repoa44010", 256, TRUE);