将Player中的send改为emit

Infinideastudio · Sep 4, 2016 · 8d8985d · 8d8985d
1 parent 922c069
commit 8d8985d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/server/src/Player.js b/server/src/Player.js
@@ -2,7 +2,7 @@ function Player(socket) {
     this.socket = socket;
     this.id = socket.id;
     this.name = null;
-    this.send = this.socket.emit.bind(socket);
+    this.emit = this.socket.emit.bind(socket);
     this.connected = true;
 }
 

diff --git a/server/src/Room.js b/server/src/Room.js
@@ -25,8 +25,8 @@ function Room(leftPlayer, rightPlayer, closeHandler, id) {
 
     this.setPlayer(this.leftPlayer, left);
     this.setPlayer(this.rightPlayer, right);
-    this.leftPlayer.send('start', { side: left, room: id, opponentName: this.rightPlayer.name });
-    this.rightPlayer.send('start', { side: right, room: id, opponentName: this.leftPlayer.name });
+    this.leftPlayer.emit('start', { side: left, room: id, opponentName: this.rightPlayer.name });
+    this.rightPlayer.emit('start', { side: right, room: id, opponentName: this.leftPlayer.name });
 
     this.createAndTellNextChessman();
 }
@@ -53,10 +53,10 @@ Room.prototype.onMove = function (side, data) {
     }
     if (this.movingCol != null && this.totalMovementTimes < config.maxMovementTimes) {
         this.totalMovementTimes++;
-        this.waitingPlayer().send('move', { col: data.col });
+        this.waitingPlayer().emit('move', { col: data.col });
         if (this.move(this.movingCol, this.nextChessman)) {
-            this.currentPlayer().send('endGame', { reason: EndReason.opponentWins });
-            this.waitingPlayer().send('endGame', { reason: EndReason.youWin });
+            this.currentPlayer().emit('endGame', { reason: EndReason.opponentWins });
+            this.waitingPlayer().emit('endGame', { reason: EndReason.youWin });
             clearTimeout(this.timeOutTID);
             this.close();
         } else {
@@ -72,13 +72,13 @@ Room.prototype.onEndTurn = function (side) {
     if (side == this.turn && this.movingCol != null && this.totalMovementTimes <= config.maxMovementTimes) {
         this.movingCol = null;
         this.setTurn(this.turn == left ? right : left);
-        this.currentPlayer().send('endTurn');
+        this.currentPlayer().emit('endTurn');
     }
 };
 
 Room.prototype.onDisconnect = function (side) {
     if (!this.ended) {
-        (side == left ? this.rightPlayer : this.leftPlayer).send('endGame', { reason: EndReason.opponentLeft });
+        (side == left ? this.rightPlayer : this.leftPlayer).emit('endGame', { reason: EndReason.opponentLeft });
         clearTimeout(this.timeOutTID);
         this.close();
     }
@@ -102,15 +102,15 @@ Room.prototype.setTurn = function (turn) {
 };
 
 Room.prototype.timeOut = function () {
-    this.currentPlayer().send('endGame', { reason: EndReason.youOutOfTime });
-    this.waitingPlayer().send('endGame', { reason: EndReason.opponentOutOfTime });
+    this.currentPlayer().emit('endGame', { reason: EndReason.youOutOfTime });
+    this.waitingPlayer().emit('endGame', { reason: EndReason.opponentOutOfTime });
     this.close();
 };
 
 Room.prototype.createAndTellNextChessman = function () {
     this.nextChessman = this.getRandomChessman();
-    this.leftPlayer.send('nextChessman', { chessman: this.nextChessman });
-    this.rightPlayer.send('nextChessman', { chessman: this.nextChessman });
+    this.leftPlayer.emit('nextChessman', { chessman: this.nextChessman });
+    this.rightPlayer.emit('nextChessman', { chessman: this.nextChessman });
 };
 
 Room.prototype.getRandomChessman = function () {

diff --git a/server/src/server.js b/server/src/server.js
@@ -51,7 +51,7 @@ function connectHandler(player) {
         }
         else {
             console.log("Server is full!");
-            player.send('endGame', { reason: EndReason.serverFull });
+            player.emit('endGame', { reason: EndReason.serverFull });
             player.disconnect();
         }
     });