Skip to content

S
sejong25
Commit 347e52db authored by 18신대성's avatar 18신대성
Browse files
Options

시즌1호 머지

parent d29662e9
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 51 deletions
index.html
View file @ 347e52db
...@@ -2,17 +2,11 @@ ...@@ -2,17 +2,11 @@
<html> <html>
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<<<<<<< HEAD
<script src="/socket.io/socket.io.js"></script> <script src="/socket.io/socket.io.js"></script>
<script src="js/phaser.js"></script> <script src="js/phaser.js"></script>
<script src="js/Background.js"></script> <script src="js/Background.js"></script>
<script src="js/Word.js"></script> <script src="js/WordSpace.js"></script>
======= <script src="js/WordObject.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
</head> </head>
<body> <body>
<script src="js/Main.js"></script> <script src="js/Main.js"></script>
......
js/Word.js deleted 100644 → 0
View file @ d29662e9
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
js/WordObject.js
View file @ 347e52db
...@@ -46,17 +46,17 @@ class WordObject ...@@ -46,17 +46,17 @@ class WordObject
{ {
return this.wordWeight; return this.wordWeight;
} }
}
//***********ToDo************* //***********ToDo*************
WordObject.isEqual(inputWord) isEqual(inputWord)
{
if(inputWord === this.wordText)
{ {
this.destroy(); if(inputWord === this.wordText)
{
this.destroy();
}
} }
//****************************
} }
//****************************
function firstSound(charText) function firstSound(charText)
{ {
......
js/main.js
View file @ 347e52db
...@@ -52,17 +52,14 @@ function create() ...@@ -52,17 +52,14 @@ function create()
function update() 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++) for(i = 0; i < WordSpace.wordGroup.length; i++)
{ {
WordSpace.wordGroup[i].attract(0.3); 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment