diff --git a/src/constants/GameStateConst.ts b/src/constants/GameStateConst.ts
index 3ebd7db..742dfe5 100644
--- a/src/constants/GameStateConst.ts
+++ b/src/constants/GameStateConst.ts
@@ -16,6 +16,8 @@ export class GameStateConst {
     public static readonly DETERMINE_TURN = 6;
     // 选英雄阶段
     public static readonly CHANGE_HERO = 7;
+    // 游戏中的结算轮
+    public static readonly STATE_ROUND_RESULT = 8;
     // 游戏结束
     public static readonly STATE_GAME_OVER = 9;
 
diff --git a/src/global.d.ts b/src/global.d.ts
index 4bcf86d..5fe9e91 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -9,12 +9,19 @@ declare global {
         }
     }
 }
-
-declare module colyseus {
-    namespace Colyseus {
-        class Room {
-            testFun(param1: string): void;
-        }
+/**
+ * GeneralRoom 扩展方法
+ */
+import { Room } from "colyseus";
+declare module "colyseus" {
+    interface Room {
+        /**
+         * 广播玩家加入房间
+         * @param data
+         * @param options
+         */
+        bUserJoin(data?: any, options?: any): void;
     }
 }
 
+
diff --git a/src/index.ts b/src/index.ts
index 6771c59..f9ae7b5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -9,6 +9,7 @@ import { GeneralRoom } from "./rooms/GeneralRoom";
 import {MongooseDriver} from "colyseus/lib/matchmaker/drivers/MongooseDriver";
 import {initData} from "./common/GConfig";
 
+require('./rooms/MSender');
 
 const port = Number(process.env.PORT || 2567);
 const app = express()
diff --git a/src/rooms/GeneralRoom.ts b/src/rooms/GeneralRoom.ts
index 0a9d3a6..3e230cc 100644
--- a/src/rooms/GeneralRoom.ts
+++ b/src/rooms/GeneralRoom.ts
@@ -81,4 +81,14 @@ export class GeneralRoom extends Room {
     this.dispatcher.stop();
   }
 
+  /**
+   * begin of message
+   */
+
+
+  /**
+   * end of message
+   */
+
+
 }
diff --git a/src/rooms/MSender.ts b/src/rooms/MSender.ts
new file mode 100644
index 0000000..4640ed9
--- /dev/null
+++ b/src/rooms/MSender.ts
@@ -0,0 +1,8 @@
+import { Room } from "colyseus";
+
+const room = Room.prototype;
+
+room.bUserJoin = function (data, options?: any) {
+    this.broadcast("player_join", data, options);
+}
+
diff --git a/src/rooms/commands/NextTurnCommand.ts b/src/rooms/commands/NextTurnCommand.ts
index 5a5aea5..44826cf 100644
--- a/src/rooms/commands/NextTurnCommand.ts
+++ b/src/rooms/commands/NextTurnCommand.ts
@@ -1,6 +1,7 @@
 import {Command} from "@colyseus/command";
 import {CardGameState} from "../schema/CardGameState";
 import {DrawCommand} from "./DrawCommand";
+import {GameStateConst} from "../../constants/GameStateConst";
 
 /**
  * 下一轮
@@ -8,7 +9,7 @@ import {DrawCommand} from "./DrawCommand";
 export class NextTurnCommand extends Command<CardGameState, {}> {
 
     execute() {
-        this.state.gameState = 2;
+        this.state.gameState = GameStateConst.STATE_BEGIN_DRAW;
         this.state.subTurn = '';
         const sessionIds = [...this.state.players.keys()];
         this.state.currentTurn = (this.state.currentTurn)
diff --git a/src/rooms/commands/OnJoinCommand.ts b/src/rooms/commands/OnJoinCommand.ts
index c8828eb..bb57af3 100644
--- a/src/rooms/commands/OnJoinCommand.ts
+++ b/src/rooms/commands/OnJoinCommand.ts
@@ -21,7 +21,7 @@ export class OnJoinCommand extends Command<CardGameState, {
             this.room.lock();
             this.state.gameState = GameStateConst.STATE_WAIT_PREPARE;
         }
-        this.room.broadcast("player_join", `${client.sessionId}`, {except: client});
+        this.room.bUserJoin(`${client.sessionId}`, {except: client});
     }
 
 }
diff --git a/src/rooms/commands/PartResultCommand.ts b/src/rooms/commands/PartResultCommand.ts
new file mode 100644
index 0000000..abc4c9c
--- /dev/null
+++ b/src/rooms/commands/PartResultCommand.ts
@@ -0,0 +1,16 @@
+import {Command} from "@colyseus/command";
+import {CardGameState} from "../schema/CardGameState";
+import {DrawCommand} from "./DrawCommand";
+import {GameStateConst} from "../../constants/GameStateConst";
+
+/**
+ * 游戏中的结算轮
+ * TODO::
+ */
+export class PartResultCommand extends Command<CardGameState, {}> {
+
+    execute() {
+        this.state.gameState = GameStateConst.STATE_ROUND_RESULT;
+    }
+
+}
diff --git a/src/utils/game.util.ts b/src/utils/game.util.ts
index af4cd36..cda52c6 100644
--- a/src/utils/game.util.ts
+++ b/src/utils/game.util.ts
@@ -2,14 +2,14 @@ import {Card} from "../rooms/schema/Card";
 
 import arrUtil from "./array.util";
 import {Player} from "../rooms/schema/Player";
-import {singleton} from "../common/Singleton";
-import {GameEnv} from "../cfg/GameEnv";
 import {BaseConst} from "../constants/BaseConst";
 import {SystemCardCfg} from "../cfg/parsers/SystemCardCfg";
 import {EffectCardCfg} from "../cfg/parsers/EffectCardCfg";
 
 let gameUtil = {
-    // TODO: 根据配表生成牌组
+    /**
+     * 游戏开始时, 初始化卡组
+     */
     initCardQue() {
         let cards: Array<Card> = [];
         let numCfgMap: Map<number, SystemCardCfg> = global.$cfg.get(BaseConst.SYSTEMCARD);
@@ -34,6 +34,12 @@ let gameUtil = {
         arrUtil.randomSort(cards);
         return cards;
     },
+    /**
+     * 根据配表中的权重, 获取一个效果卡的id
+     * @param weightArr 配表中的权重列表
+     * @param effCfgMap 配表中的所有效果卡的配置
+     * @param countMap  当前已生成的效果卡数量
+     */
     getRandomEffect(weightArr: number[][], effCfgMap: Map<number, EffectCardCfg>, countMap: Map<number, number>) {
         let total = 0;
         let tmpArr:number[][] = [];
diff --git a/tsconfig.json b/tsconfig.json
index 6549b4f..fd67a3e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,6 +14,7 @@
     "strict": true,
     "strictNullChecks": false,
     "esModuleInterop": true,
+    "moduleResolution": "node",
     "experimentalDecorators": true
   }
 }