diff --git a/public/.DS_Store b/public/.DS_Store index 508bda1..0f9a10f 100644 Binary files a/public/.DS_Store and b/public/.DS_Store differ diff --git a/public/public3/audio/김도연_걷는소리.mp3 b/public/public3/audio/김도연_걷는소리.mp3 new file mode 100644 index 0000000..38dba9b Binary files /dev/null and b/public/public3/audio/김도연_걷는소리.mp3 differ diff --git a/public/public3/audio/김도연_미끄러짐.mp3 b/public/public3/audio/김도연_미끄러짐.mp3 new file mode 100644 index 0000000..0d82925 Binary files /dev/null and b/public/public3/audio/김도연_미끄러짐.mp3 differ diff --git a/public/public3/audio/김도연_차.mp3 b/public/public3/audio/김도연_차.mp3 new file mode 100644 index 0000000..3894c6e Binary files /dev/null and b/public/public3/audio/김도연_차.mp3 differ diff --git a/public/public3/audio/바람_이민혁.mp3 b/public/public3/audio/바람_이민혁.mp3 new file mode 100644 index 0000000..3b82584 Binary files /dev/null and b/public/public3/audio/바람_이민혁.mp3 differ diff --git a/public/public3/audio/쓸리는소리_이민혁.mp3 b/public/public3/audio/쓸리는소리_이민혁.mp3 new file mode 100644 index 0000000..ccda5f9 Binary files /dev/null and b/public/public3/audio/쓸리는소리_이민혁.mp3 differ diff --git a/public/public3/audio/이주연_데였을때내는소리.mp3 b/public/public3/audio/이주연_데였을때내는소리.mp3 new file mode 100644 index 0000000..60bbfa5 Binary files /dev/null and b/public/public3/audio/이주연_데였을때내는소리.mp3 differ diff --git a/public/public3/audio/이주연_보글보글.mp3 b/public/public3/audio/이주연_보글보글.mp3 new file mode 100644 index 0000000..f0dc331 Binary files /dev/null and b/public/public3/audio/이주연_보글보글.mp3 differ diff --git a/public/public3/audio/이주연_친구소리.mp3 b/public/public3/audio/이주연_친구소리.mp3 new file mode 100644 index 0000000..62952ea Binary files /dev/null and b/public/public3/audio/이주연_친구소리.mp3 differ diff --git a/public/public3/audio/체인_이민혁.mp3 b/public/public3/audio/체인_이민혁.mp3 new file mode 100644 index 0000000..48cabc4 Binary files /dev/null and b/public/public3/audio/체인_이민혁.mp3 differ diff --git a/public/public3/conductor/audio/김도연_걷는소리.mp3 b/public/public3/conductor/audio/김도연_걷는소리.mp3 new file mode 100644 index 0000000..38dba9b Binary files /dev/null and b/public/public3/conductor/audio/김도연_걷는소리.mp3 differ diff --git a/public/public3/conductor/audio/김도연_미끄러짐.mp3 b/public/public3/conductor/audio/김도연_미끄러짐.mp3 new file mode 100644 index 0000000..0d82925 Binary files /dev/null and b/public/public3/conductor/audio/김도연_미끄러짐.mp3 differ diff --git a/public/public3/conductor/audio/김도연_차.mp3 b/public/public3/conductor/audio/김도연_차.mp3 new file mode 100644 index 0000000..3894c6e Binary files /dev/null and b/public/public3/conductor/audio/김도연_차.mp3 differ diff --git a/public/public3/conductor/audio/바람_이민혁.mp3 b/public/public3/conductor/audio/바람_이민혁.mp3 new file mode 100644 index 0000000..3b82584 Binary files /dev/null and b/public/public3/conductor/audio/바람_이민혁.mp3 differ diff --git a/public/public3/conductor/audio/쓸리는소리_이민혁.mp3 b/public/public3/conductor/audio/쓸리는소리_이민혁.mp3 new file mode 100644 index 0000000..ccda5f9 Binary files /dev/null and b/public/public3/conductor/audio/쓸리는소리_이민혁.mp3 differ diff --git a/public/public3/conductor/audio/이주연_데였을때내는소리.mp3 b/public/public3/conductor/audio/이주연_데였을때내는소리.mp3 new file mode 100644 index 0000000..60bbfa5 Binary files /dev/null and b/public/public3/conductor/audio/이주연_데였을때내는소리.mp3 differ diff --git a/public/public3/conductor/audio/이주연_보글보글.mp3 b/public/public3/conductor/audio/이주연_보글보글.mp3 new file mode 100644 index 0000000..f0dc331 Binary files /dev/null and b/public/public3/conductor/audio/이주연_보글보글.mp3 differ diff --git a/public/public3/conductor/audio/이주연_친구소리.mp3 b/public/public3/conductor/audio/이주연_친구소리.mp3 new file mode 100644 index 0000000..62952ea Binary files /dev/null and b/public/public3/conductor/audio/이주연_친구소리.mp3 differ diff --git a/public/public3/conductor/audio/체인_이민혁.mp3 b/public/public3/conductor/audio/체인_이민혁.mp3 new file mode 100644 index 0000000..48cabc4 Binary files /dev/null and b/public/public3/conductor/audio/체인_이민혁.mp3 differ diff --git a/public/public3/conductor/index.js b/public/public3/conductor/index.js index e28d58e..229da16 100644 --- a/public/public3/conductor/index.js +++ b/public/public3/conductor/index.js @@ -25,16 +25,15 @@ $(document).ready(function() { //clap AudioImport_p5("./audio/clap@2/" + ("0" + getRandomInt(1, 2)).slice(-2) + ".mp3"), //beach_sounds page 1 ==> 7 - AudioImport("./audio/고요1.mp3"), - AudioImport("./audio/고요2.mp3"), - AudioImport("./audio/고요3.mp3"), - AudioImport("./audio/고요4.mp3"), - AudioImport("./audio/고요5.mp3"), - AudioImport("./audio/고요6.mp3"), - AudioImport("./audio/고요7.mp3"), - //beach_sounds page 2 ==> 7 - AudioImport("./audio/고요8.mp3"), - AudioImport("./audio/고요9.mp3"), + AudioImport("./audio/김도연_걷는소리.mp3"), + AudioImport("./audio/체인_이민혁.mp3"), + AudioImport("./audio/이주연_친구소리.mp3"), + AudioImport("./audio/이주연_보글보글.mp3"), + AudioImport("./audio/이주연_데였을때내는소리.mp3"), + AudioImport("./audio/쓸리는소리_이민혁.mp3"), + AudioImport("./audio/바람_이민혁.mp3"), + AudioImport("./audio/김도연_차.mp3"), + AudioImport("./audio/김도연_미끄러짐.mp3"), AudioImport("./audio/고요10.mp3"), AudioImport("./audio/고요11.mp3"), AudioImport("./audio/고요12.mp3"), @@ -55,15 +54,15 @@ $(document).ready(function() { //beach list //NOTE: beware! same key is not allowed!! every keys should have different name!! var beach_sounds = { - '고요1' : imports[8], - '고요2' : imports[9], - '고요3' : imports[10], - '고요4' : imports[11], - '고요5' : imports[12], - '고요6' : imports[13], - '고요7' : imports[14], - '고요8' : imports[15], - '고요9' : imports[16], + '김도연_걷는소리' : imports[8], + '체인_이민혁' : imports[9], + '이주연_친구소리' : imports[10], + '이주연_보글보글' : imports[11], + '이주연_데였을때내는소리' : imports[12], + '쓸리는소리_이민혁' : imports[13], + '바람_이민혁' : imports[14], + '김도연_차' : imports[15], + '김도연_미끄러짐' : imports[16], '고요10' : imports[17], '고요11' : imports[18], '고요12' : imports[19], @@ -72,15 +71,15 @@ $(document).ready(function() { }; //NOTE: beware! same key is not allowed!! every keys should have different name!! var beach_players = { - '고요1': [], - '고요2': [], - '고요3': [], - '고요4': [], - '고요5': [], - '고요6': [], - '고요7': [], - '고요8': [], - '고요9': [], + '김도연_걷는소리': [], + '체인_이민혁': [], + '이주연_친구소리': [], + '이주연_보글보글': [], + '이주연_데였을때내는소리': [], + '쓸리는소리_이민혁': [], + '바람_이민혁': [], + '김도연_차': [], + '김도연_미끄러짐': [], '고요10': [], '고요11': [], '고요12': [], diff --git a/public/public3/index.js b/public/public3/index.js index c910b1c..ab1f0d0 100644 --- a/public/public3/index.js +++ b/public/public3/index.js @@ -25,21 +25,20 @@ $(document).ready(function() { //clap AudioImport_p5("./audio/clap@2/" + ("0" + getRandomInt(1, 2)).slice(-2) + ".mp3"), //sounds page 1 ==> 7 - AudioImport("./audio/합주.mp3"), - AudioImport("./audio/낙엽.mp3"), - AudioImport("./audio/새소리.mp3"), - AudioImport("./audio/물장구.mp3"), - AudioImport("./audio/이름들.mp3"), - AudioImport("./audio/물방울.mp3"), - AudioImport("./audio/사람들.mp3"), - //sounds page 2 ==> 7 - AudioImport("./audio/나무리듬.mp3"), - AudioImport("./audio/바람개비.mp3"), - AudioImport("./audio/일이삼사.mp3"), - AudioImport("./audio/뻐꾸기웃음.mp3"), - AudioImport("./audio/모래던지기.mp3"), - AudioImport("./audio/귀요미물소리.mp3"), - AudioImport("./audio/하모니카와멜로디온.mp3"), + AudioImport("./audio/김도연_걷는소리.mp3"), + AudioImport("./audio/체인_이민혁.mp3"), + AudioImport("./audio/이주연_친구소리.mp3"), + AudioImport("./audio/이주연_보글보글.mp3"), + AudioImport("./audio/이주연_데였을때내는소리.mp3"), + AudioImport("./audio/쓸리는소리_이민혁.mp3"), + AudioImport("./audio/바람_이민혁.mp3"), + AudioImport("./audio/김도연_차.mp3"), + AudioImport("./audio/김도연_미끄러짐.mp3"), + AudioImport("./audio/고요10.mp3"), + AudioImport("./audio/고요11.mp3"), + AudioImport("./audio/고요12.mp3"), + AudioImport("./audio/고요13.mp3"), + AudioImport("./audio/고요14.mp3"), // ]).then(function(imports) { //imgs @@ -55,54 +54,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], + '고요10' : imports[17], + '고요11' : imports[18], + '고요12' : imports[19], + '고요13' : imports[20], + '고요14' : imports[21], }; //NOTE: beware! same key is not allowed!! every keys should have different name!! var beach_players = { - '합주': [], - '낙엽': [], - '새소리': [], - '물장구': [], - '이름들': [], - '물방울': [], - '사람들': [], - '나무리듬': [], - '바람개비': [], - '일이삼사': [], - '뻐꾸기웃음': [], - '모래던지기': [], - '귀요미물소리': [], - '하모니카와멜로디온': [], + '김도연_걷는소리': [], + '체인_이민혁': [], + '이주연_친구소리': [], + '이주연_보글보글': [], + '이주연_데였을때내는소리': [], + '쓸리는소리_이민혁': [], + '바람_이민혁': [], + '김도연_차': [], + '김도연_미끄러짐': [], + '고요10': [], + '고요11': [], + '고요12': [], + '고요13': [], + '고요14': [], }; //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, + '고요10': 0, + '고요11': 0, + '고요12': 0, + '고요13': 0, + '고요14': 0, }; //screen changer