リビジョン | c4a551c909352dc1731c424989dca487748a0ebe (tree) |
---|---|
日時 | 2011-07-29 17:50:23 |
作者 | satofumi |
コミッター | satofumi |
効果音の再生まわりを実装した
@@ -1,7 +1,7 @@ | ||
1 | 1 | -- 和歌の表示 |
2 | 2 | -- |
3 | 3 | -- Satofumi KAMIMURA |
4 | --- $Id$ | |
4 | +-- $Id: display_waka.lua,v 6c3703ff864b 2010/05/26 01:07:02 Satofumi $ | |
5 | 5 | -- |
6 | 6 | -- \todo かな入力のときも、BS, Enter, かな文字の入力候補を表示するかを検討する |
7 | 7 |
@@ -52,6 +52,9 @@ | ||
52 | 52 | local scheduler_vibrate_enter_id_ = nil |
53 | 53 | local wait_last_enter_ = false |
54 | 54 | |
55 | +local sound_effect_miss_ = SoundEffect(Sound_miss_) | |
56 | +local sound_effect_type_ = SoundEffect(Sound_type_) | |
57 | + | |
55 | 58 | |
56 | 59 | -- カーソルの点滅用 |
57 | 60 | function blinkCursor() |
@@ -432,6 +435,13 @@ | ||
432 | 435 | waka_layer_:push_front(bs_label_) |
433 | 436 | end |
434 | 437 | |
438 | + -- タイプの効果音を鳴らす | |
439 | + if miss_detected then | |
440 | + sound_effect_miss_:play(0.0, 0.0, 0.1) | |
441 | + else | |
442 | + sound_effect_type_:play(0.0, 0.0, 0.1) | |
443 | + end | |
444 | + | |
435 | 445 | -- 改行の画像を表示 |
436 | 446 | if sample_text:len() > 0 or miss_detected then |
437 | 447 | if sample_text:len() > 0 then |
@@ -153,8 +153,8 @@ | ||
153 | 153 | display_waka(waka_id_, 100, true) |
154 | 154 | display_waka_yomibito(waka_id_, 100) |
155 | 155 | |
156 | - -- 曲の再生を止める | |
157 | - back_music_:stop(1000) | |
156 | + -- 入力完了の効果音を鳴らす | |
157 | + sound_effect_input_teminated_:play(0.0, 0.0, 0.1) | |
158 | 158 | |
159 | 159 | -- 改行を待つ |
160 | 160 | require("wait_enter") |
@@ -183,5 +183,8 @@ | ||
183 | 183 | |
184 | 184 | kimariji_typing["Exit"] = |
185 | 185 | function(state) |
186 | + -- 曲の再生を止める | |
187 | + back_music_:stop(1000) | |
188 | + | |
186 | 189 | collectgarbage("collect") |
187 | 190 | end |
@@ -169,8 +169,8 @@ | ||
169 | 169 | display_waka(waka_id_, 100, false) |
170 | 170 | display_waka_yomibito(waka_id_, 100) |
171 | 171 | |
172 | - -- 曲の再生を止める | |
173 | - back_music_:stop(1000) | |
172 | + -- 入力完了の効果音を鳴らす | |
173 | + sound_effect_input_teminated_:play(0.0, 0.0, 0.1) | |
174 | 174 | |
175 | 175 | -- 改行を待つ |
176 | 176 | require("wait_enter") |
@@ -198,5 +198,8 @@ | ||
198 | 198 | |
199 | 199 | shimonoku_typing["Exit"] = |
200 | 200 | function(state) |
201 | + -- 曲の再生を止める | |
202 | + back_music_:stop(100) | |
203 | + | |
201 | 204 | collectgarbage("collect") |
202 | 205 | end |
@@ -21,6 +21,8 @@ | ||
21 | 21 | _G.Sound_miss_ = "resources/miss.ogg" |
22 | 22 | _G.Sound_type_ = "resources/type.ogg" |
23 | 23 | |
24 | +_G.sound_effect_input_teminated_ = SoundEffect(Sound_input_terminated_) | |
25 | + | |
24 | 26 | _G.screen_ = nil |
25 | 27 | _G.audio_ = nil |
26 | 28 | _G.back_music_ = nil |