diff --git a/public/audio/beach/갈대마디.mp3 b/public/audio-third-trip/beach/갈대마디.mp3 similarity index 100% rename from public/audio/beach/갈대마디.mp3 rename to public/audio-third-trip/beach/갈대마디.mp3 diff --git a/public/audio/beach/나무다리건너.mp3 b/public/audio-third-trip/beach/나무다리건너.mp3 similarity index 100% rename from public/audio/beach/나무다리건너.mp3 rename to public/audio-third-trip/beach/나무다리건너.mp3 diff --git a/public/audio-third-trip/beach/낙엽.mp3 b/public/audio-third-trip/beach/낙엽.mp3 new file mode 100644 index 0000000..c539c2d Binary files /dev/null and b/public/audio-third-trip/beach/낙엽.mp3 differ diff --git a/public/audio/beach/달팽이종소리.mp3 b/public/audio-third-trip/beach/달팽이종소리.mp3 similarity index 100% rename from public/audio/beach/달팽이종소리.mp3 rename to public/audio-third-trip/beach/달팽이종소리.mp3 diff --git a/public/audio/beach/모래놀이.mp3 b/public/audio-third-trip/beach/모래놀이.mp3 similarity index 100% rename from public/audio/beach/모래놀이.mp3 rename to public/audio-third-trip/beach/모래놀이.mp3 diff --git a/public/audio/beach/물소리.mp3 b/public/audio-third-trip/beach/물소리.mp3 similarity index 100% rename from public/audio/beach/물소리.mp3 rename to public/audio-third-trip/beach/물소리.mp3 diff --git a/public/audio-third-trip/beach/물장구.mp3 b/public/audio-third-trip/beach/물장구.mp3 new file mode 100644 index 0000000..04f1fb7 Binary files /dev/null and b/public/audio-third-trip/beach/물장구.mp3 differ diff --git a/public/audio/beach/바람불어오는.mp3 b/public/audio-third-trip/beach/바람불어오는.mp3 similarity index 100% rename from public/audio/beach/바람불어오는.mp3 rename to public/audio-third-trip/beach/바람불어오는.mp3 diff --git a/public/audio/beach/변했데.mp3 b/public/audio-third-trip/beach/변했데.mp3 similarity index 100% rename from public/audio/beach/변했데.mp3 rename to public/audio-third-trip/beach/변했데.mp3 diff --git a/public/audio/beach/북+하모니카.mp3 b/public/audio-third-trip/beach/북+하모니카.mp3 similarity index 100% rename from public/audio/beach/북+하모니카.mp3 rename to public/audio-third-trip/beach/북+하모니카.mp3 diff --git a/public/audio/beach/안녕이름들.mp3 b/public/audio-third-trip/beach/안녕이름들.mp3 similarity index 100% rename from public/audio/beach/안녕이름들.mp3 rename to public/audio-third-trip/beach/안녕이름들.mp3 diff --git a/public/audio/beach/하모니카.mp3 b/public/audio-third-trip/beach/하모니카.mp3 similarity index 100% rename from public/audio/beach/하모니카.mp3 rename to public/audio-third-trip/beach/하모니카.mp3 diff --git a/public/audio-third-trip/beach/합주.mp3 b/public/audio-third-trip/beach/합주.mp3 new file mode 100644 index 0000000..07638ca Binary files /dev/null and b/public/audio-third-trip/beach/합주.mp3 differ diff --git a/public/audio/beach/흥얼거림.mp3 b/public/audio-third-trip/beach/흥얼거림.mp3 similarity index 100% rename from public/audio/beach/흥얼거림.mp3 rename to public/audio-third-trip/beach/흥얼거림.mp3 diff --git a/public/audio-third-trip/clap@2/01.mp3 b/public/audio-third-trip/clap@2/01.mp3 new file mode 100644 index 0000000..8019a14 Binary files /dev/null and b/public/audio-third-trip/clap@2/01.mp3 differ diff --git a/public/audio-third-trip/clap@2/02.mp3 b/public/audio-third-trip/clap@2/02.mp3 new file mode 100644 index 0000000..745dca0 Binary files /dev/null and b/public/audio-third-trip/clap@2/02.mp3 differ diff --git a/public/audio/beach/귀요미물소리.mp3 b/public/audio/beach/귀요미물소리.mp3 new file mode 100644 index 0000000..70b8ab9 Binary files /dev/null and b/public/audio/beach/귀요미물소리.mp3 differ diff --git a/public/audio/beach/나무리듬.mp3 b/public/audio/beach/나무리듬.mp3 new file mode 100644 index 0000000..a706a14 Binary files /dev/null and b/public/audio/beach/나무리듬.mp3 differ diff --git a/public/audio/beach/낙엽.mp3 b/public/audio/beach/낙엽.mp3 index c539c2d..474199d 100644 Binary files a/public/audio/beach/낙엽.mp3 and b/public/audio/beach/낙엽.mp3 differ diff --git a/public/audio/beach/모래던지기.mp3 b/public/audio/beach/모래던지기.mp3 new file mode 100644 index 0000000..14729ec Binary files /dev/null and b/public/audio/beach/모래던지기.mp3 differ diff --git a/public/audio/beach/물방울.mp3 b/public/audio/beach/물방울.mp3 new file mode 100644 index 0000000..7d96094 Binary files /dev/null and b/public/audio/beach/물방울.mp3 differ diff --git a/public/audio/beach/물장구.mp3 b/public/audio/beach/물장구.mp3 index 04f1fb7..f8a6a98 100644 Binary files a/public/audio/beach/물장구.mp3 and b/public/audio/beach/물장구.mp3 differ diff --git a/public/audio/beach/바람개비.mp3 b/public/audio/beach/바람개비.mp3 new file mode 100644 index 0000000..7d16220 Binary files /dev/null and b/public/audio/beach/바람개비.mp3 differ diff --git a/public/audio/beach/뻐꾸기웃음.mp3 b/public/audio/beach/뻐꾸기웃음.mp3 new file mode 100644 index 0000000..96d7dd1 Binary files /dev/null and b/public/audio/beach/뻐꾸기웃음.mp3 differ diff --git a/public/audio/beach/사람들.mp3 b/public/audio/beach/사람들.mp3 new file mode 100644 index 0000000..6295017 Binary files /dev/null and b/public/audio/beach/사람들.mp3 differ diff --git a/public/audio/beach/새소리.mp3 b/public/audio/beach/새소리.mp3 new file mode 100644 index 0000000..59db58b Binary files /dev/null and b/public/audio/beach/새소리.mp3 differ diff --git a/public/audio/beach/이름들.mp3 b/public/audio/beach/이름들.mp3 new file mode 100644 index 0000000..1c9cc10 Binary files /dev/null and b/public/audio/beach/이름들.mp3 differ diff --git a/public/audio/beach/일이삼사.mp3 b/public/audio/beach/일이삼사.mp3 new file mode 100644 index 0000000..4e46d23 Binary files /dev/null and b/public/audio/beach/일이삼사.mp3 differ diff --git a/public/audio/beach/하모니카와멜로디온.mp3 b/public/audio/beach/하모니카와멜로디온.mp3 new file mode 100644 index 0000000..983b403 Binary files /dev/null and b/public/audio/beach/하모니카와멜로디온.mp3 differ diff --git a/public/audio/beach/합주.mp3 b/public/audio/beach/합주.mp3 index 07638ca..0553028 100644 Binary files a/public/audio/beach/합주.mp3 and b/public/audio/beach/합주.mp3 differ diff --git a/public/conductor/index.js b/public/conductor/index.js index 6bad9b3..673745e 100644 --- a/public/conductor/index.js +++ b/public/conductor/index.js @@ -25,21 +25,21 @@ $(document).ready(function() { //clap AudioImport_p5("./audio/clap@2/" + ("0" + getRandomInt(1, 2)).slice(-2) + ".mp3"), //beach_sounds page 1 ==> 7 - AudioImport("./audio/beach/북+하모니카.mp3"), AudioImport("./audio/beach/합주.mp3"), AudioImport("./audio/beach/낙엽.mp3"), - AudioImport("./audio/beach/변했데.mp3"), + AudioImport("./audio/beach/새소리.mp3"), AudioImport("./audio/beach/물장구.mp3"), - AudioImport("./audio/beach/흥얼거림.mp3"), - AudioImport("./audio/beach/모래놀이.mp3"), + AudioImport("./audio/beach/이름들.mp3"), + AudioImport("./audio/beach/물방울.mp3"), + AudioImport("./audio/beach/사람들.mp3"), //beach_sounds page 2 ==> 7 - AudioImport("./audio/beach/물소리.mp3"), - AudioImport("./audio/beach/하모니카.mp3"), - AudioImport("./audio/beach/갈대마디.mp3"), - AudioImport("./audio/beach/바람불어오는.mp3"), - AudioImport("./audio/beach/달팽이종소리.mp3"), - AudioImport("./audio/beach/나무다리건너.mp3"), - AudioImport("./audio/beach/안녕이름들.mp3"), + AudioImport("./audio/beach/나무리듬.mp3"), + AudioImport("./audio/beach/바람개비.mp3"), + AudioImport("./audio/beach/일이삼사.mp3"), + AudioImport("./audio/beach/뻐꾸기웃음.mp3"), + AudioImport("./audio/beach/모래던지기.mp3"), + AudioImport("./audio/beach/귀요미물소리.mp3"), + AudioImport("./audio/beach/하모니카와멜로디온.mp3"), // ]).then(function(imports) { //imgs @@ -55,37 +55,37 @@ $(document).ready(function() { //beach list //NOTE: beware! same key is not allowed!! every keys should have different name!! var beach_sounds = { - '북하모니': imports[8], - '합주': imports[9], - '낙엽': imports[10], - '변했데': imports[11], - '물장구': imports[12], - '흥얼': imports[13], - '모래놀이': imports[14], - '물소리': imports[15], - '하모니카': imports[16], - '갈대마디': imports[17], - '바람': imports[18], - '달팽이': imports[19], - '나무다리': imports[20], - '이름': imports[21], + '합주' : imports[8], + '낙엽' : imports[9], + '새소리' : imports[10], + '물장구' : imports[11], + '이름들' : imports[12], + '물방울' : imports[13], + '사람들' : imports[14], + '나무리듬' : imports[15], + '바람개비' : imports[16], + '일이삼사' : imports[17], + '뻐꾸기웃음' : imports[18], + '모래던지기' : imports[19], + '귀요미물소리' : imports[20], + '하모니카와멜로디온' : imports[21], }; //NOTE: beware! same key is not allowed!! every keys should have different name!! var beach_players = { - '북하모니': [], '합주': [], '낙엽': [], - '변했데': [], + '새소리': [], '물장구': [], - '흥얼': [], - '모래놀이': [], - '물소리': [], - '하모니카': [], - '갈대마디': [], - '바람': [], - '달팽이': [], - '나무다리': [], - '이름': [], + '이름들': [], + '물방울': [], + '사람들': [], + '나무리듬': [], + '바람개비': [], + '일이삼사': [], + '뻐꾸기웃음': [], + '모래던지기': [], + '귀요미물소리': [], + '하모니카와멜로디온': [], }; //screen changer diff --git a/public/index.js b/public/index.js index c720ab3..bc15eeb 100644 --- a/public/index.js +++ b/public/index.js @@ -25,21 +25,21 @@ $(document).ready(function() { //clap AudioImport_p5("./audio/clap@2/" + ("0" + getRandomInt(1, 2)).slice(-2) + ".mp3"), //beach_sounds page 1 ==> 7 - AudioImport("./audio/beach/북+하모니카.mp3"), AudioImport("./audio/beach/합주.mp3"), AudioImport("./audio/beach/낙엽.mp3"), - AudioImport("./audio/beach/변했데.mp3"), + AudioImport("./audio/beach/새소리.mp3"), AudioImport("./audio/beach/물장구.mp3"), - AudioImport("./audio/beach/흥얼거림.mp3"), - AudioImport("./audio/beach/모래놀이.mp3"), + AudioImport("./audio/beach/이름들.mp3"), + AudioImport("./audio/beach/물방울.mp3"), + AudioImport("./audio/beach/사람들.mp3"), //beach_sounds page 2 ==> 7 - AudioImport("./audio/beach/물소리.mp3"), - AudioImport("./audio/beach/하모니카.mp3"), - AudioImport("./audio/beach/갈대마디.mp3"), - AudioImport("./audio/beach/바람불어오는.mp3"), - AudioImport("./audio/beach/달팽이종소리.mp3"), - AudioImport("./audio/beach/나무다리건너.mp3"), - AudioImport("./audio/beach/안녕이름들.mp3"), + AudioImport("./audio/beach/나무리듬.mp3"), + AudioImport("./audio/beach/바람개비.mp3"), + AudioImport("./audio/beach/일이삼사.mp3"), + AudioImport("./audio/beach/뻐꾸기웃음.mp3"), + AudioImport("./audio/beach/모래던지기.mp3"), + AudioImport("./audio/beach/귀요미물소리.mp3"), + AudioImport("./audio/beach/하모니카와멜로디온.mp3"), // ]).then(function(imports) { //imgs @@ -55,54 +55,54 @@ $(document).ready(function() { //beach list //NOTE: beware! same key is not allowed!! every keys should have different name!! var beach_sounds = { - '북하모니': imports[8], - '합주': imports[9], - '낙엽': imports[10], - '변했데': imports[11], - '물장구': imports[12], - '흥얼': imports[13], - '모래놀이': imports[14], - '물소리': imports[15], - '하모니카': imports[16], - '갈대마디': imports[17], - '바람': imports[18], - '달팽이': imports[19], - '나무다리': imports[20], - '이름': imports[21], + '합주' : imports[8], + '낙엽' : imports[9], + '새소리' : imports[10], + '물장구' : imports[11], + '이름들' : imports[12], + '물방울' : imports[13], + '사람들' : imports[14], + '나무리듬' : imports[15], + '바람개비' : imports[16], + '일이삼사' : imports[17], + '뻐꾸기웃음' : imports[18], + '모래던지기' : imports[19], + '귀요미물소리' : imports[20], + '하모니카와멜로디온' : imports[21], }; //NOTE: beware! same key is not allowed!! every keys should have different name!! var beach_players = { - '북하모니': [], '합주': [], '낙엽': [], - '변했데': [], + '새소리': [], '물장구': [], - '흥얼': [], - '모래놀이': [], - '물소리': [], - '하모니카': [], - '갈대마디': [], - '바람': [], - '달팽이': [], - '나무다리': [], - '이름': [], + '이름들': [], + '물방울': [], + '사람들': [], + '나무리듬': [], + '바람개비': [], + '일이삼사': [], + '뻐꾸기웃음': [], + '모래던지기': [], + '귀요미물소리': [], + '하모니카와멜로디온': [], }; //NOTE: beware! same key is not allowed!! every keys should have different name!! var beach_playcounts = { - '북하모니': 0, '합주': 0, '낙엽': 0, - '변했데': 0, + '새소리': 0, '물장구': 0, - '흥얼': 0, - '모래놀이': 0, - '물소리': 0, - '하모니카': 0, - '갈대마디': 0, - '바람': 0, - '달팽이': 0, - '나무다리': 0, - '이름': 0, + '이름들': 0, + '물방울': 0, + '사람들': 0, + '나무리듬': 0, + '바람개비': 0, + '일이삼사': 0, + '뻐꾸기웃음': 0, + '모래던지기': 0, + '귀요미물소리': 0, + '하모니카와멜로디온': 0, }; //screen changer