시즌1호 머지

347e52db · 18신대성 · d29662e9 · 347e52db · d29662e9 · 347e52db
Commit 347e52db authored Jun 26, 2019 by 18신대성
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 51 deletions

index.html index.html +2 -8

Word.js js/Word.js +0 -28

WordObject.js js/WordObject.js +7 -7

main.js js/main.js +5 -8

No files found.
--- a/index.html
+++ b/index.html
@@ -2,17 +2,11 @@
 <html>
 <head>
    <meta charset="utf-8"/>
-<<<<<<< HEAD
    <script src="/socket.io/socket.io.js"></script>
    <script src="js/phaser.js"></script>
    <script src="js/Background.js"></script>
-    <script src="js/Word.js"></script>
-=======
-    <script src="script/phaser.js"></script>
-    <script src="script/Background.js"></script>
-    <script src="script/WordSpace.js"></script>
-    <script src="script/WordObject.js"></script>
->>>>>>> word
+    <script src="js/WordSpace.js"></script>
+    <script src="js/WordObject.js"></script>
 </head>
 <body>
    <script src="js/Main.js"></script>

--- a/js/Word.js
+++ b/js/Word.js
-class Word
-{
-    constructor(text)
-    {
-        this.wordText = text;
-    }
-
-    generate(scene)
-    {
-        scene.add.text(400,300, this.wordText, {fontFamily: '"궁서", 궁서체, serif'}).setBackgroundColor('#FF00FF');
-    }
-}
-
-/*
-function Word()
-{
-    this.wordText = '임시텍스트';
-}
-
-Word.prototype.generate = function(scene)
-{
-    myText = scene.add.text(400,300, this.wordText, {fontFamily: '"궁서", 궁서체, serif'}).setBackgroundColor('#FF00FF');
-}
-
-Word.prototype.delete = function()
-{
-
-}*/
\ No newline at end of file
--- a/js/WordObject.js
+++ b/js/WordObject.js
@@ -46,17 +46,17 @@ class WordObject
    {
        return this.wordWeight;
    }
-}

-//***********ToDo*************
-WordObject.isEqual(inputWord)
-{
-    if(inputWord === this.wordText)
+    //***********ToDo*************
+    isEqual(inputWord)
    {
-        this.destroy();
+        if(inputWord === this.wordText)
+        {
+            this.destroy();
+        }
    }
+    //****************************
 }
-//****************************

 function firstSound(charText)
 {

--- a/js/main.js
+++ b/js/main.js
@@ -52,17 +52,14 @@ function create()

 function update()
 {
-    var socket = io.connect();
-    socket.on('hi', function(msg) {
-        console.log(msg);
-    });
-    socket.emit('hello');
-    
    for(i = 0; i < WordSpace.wordGroup.length; i++)
    {
        WordSpace.wordGroup[i].attract(0.3);
    }
 }

-
-
+var socket = io.connect();
+socket.on('hi', function(msg) {
+    console.log(msg);
+});
+socket.emit('hello');
\ No newline at end of file