将各计时器的名字改为常量

src/constants/ClockNameConst.ts

@@ -0,0 +1,32 @@
+export class ClockNameConst {
+  /**
+   * 抽卡计时器
+   * @type {string}
+   */
+  public static readonly DRAW_CARD = 'draw_card'
+  /**
+   * 选择随从计时器
+   * @type {string}
+   */
+  public static readonly SELECT_PET = 'select_pet'
+  /**
+   * 选择英雄计时器
+   * @type {string}
+   */
+  public static readonly PICK_HERO = 'pick_hero'
+  /**
+   * 等候玩家计时器
+    * @type {string}
+   */
+  public static readonly WAITING_PLAYER = 'waiting_player'
+  /**
+   * 重新开始游戏
+   * @type {string}
+   */
+  public static readonly RESTART_SCHEDULE = 'restart_schedule'
+  /**
+   * 吃牌轮
+   * @type {string}
+   */
+  public static readonly EAT_ROUND = 'eat_round'
+}

src/rooms/commands/DiscardCommand.ts

@@ -10,6 +10,7 @@ import { Card } from '../schema/Card'
 import { Wait } from './Wait'
 import { StateTypeEnum } from '../enums/StateTypeEnum'
 import { RoomOptions } from '../../cfg/RoomOptions'
+import { ClockNameConst } from '../../constants/ClockNameConst'
 
 /**
  * 出牌
@@ -58,7 +59,7 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
     }
     let targetCard
     if (target) {
-      if (!new RoomOptions().canEat({advMode: this.state.advMode})) {
+      if (!new RoomOptions().canEat({ advMode: this.state.advMode })) {
         this.room.send(client, 'discard_card_s2c', {
           errcode: 7,
           errmsg: '当前游戏不允许吃牌'
@@ -105,7 +106,7 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
 
 
     //停止出牌计时, 并更新player.extraTime;
-    let elapsedTime = this.room.stopSchedule('draw_card')
+    let elapsedTime = this.room.stopSchedule(ClockNameConst.DRAW_CARD)
     if (elapsedTime >= 0) {
       let maxTime = new GameEnv().maxDiscardTime * 1000
       let count = elapsedTime - maxTime
@@ -159,7 +160,7 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
         debugRoom('选随从或者法术时间到, 自动出牌, 自动进入下一轮')
         self.room.dispatcher.dispatch(new TurnEndCommand())
       }
-      this.room.beginSchedule(time, timeOverSelectPet, `select_pet`)
+      this.room.beginSchedule(time, timeOverSelectPet, ClockNameConst.SELECT_PET)
     }
   }
 }

src/rooms/commands/DrawCommand.ts

@@ -1,30 +1,35 @@
-import {Command} from "@colyseus/command";
+import { Command } from '@colyseus/command'
-import {CardGameState} from "../schema/CardGameState";
+import { CardGameState } from '../schema/CardGameState'
-import {GameEnv} from "../../cfg/GameEnv";
+import { GameEnv } from '../../cfg/GameEnv'
-import {debugRoom} from "../../common/Debug";
+import { debugRoom } from '../../common/Debug'
-import {DiscardCommand} from "./DiscardCommand";
+import { DiscardCommand } from './DiscardCommand'
+import { ClockNameConst } from '../../constants/ClockNameConst'
 
 /**
  * 正常的抽卡
  */
 export class DrawCommand extends Command<CardGameState, {}> {
-    async execute() {
+  async execute() {
-        let sessionId = this.state.currentTurn;
+    let sessionId = this.state.currentTurn
-        this.room.addCard(sessionId, new GameEnv().roundDrawNum, 0);
+    this.room.addCard(sessionId, new GameEnv().roundDrawNum, 0)
-        let maxTime = new GameEnv().maxDiscardTime * 1000;
+    let maxTime = new GameEnv().maxDiscardTime * 1000
-        let player = this.state.players.get(sessionId);
+    let player = this.state.players.get(sessionId)
-        let self = this;
+    let self = this
-        let timeOverDraw = function () {
+    let timeOverDraw = function () {
-            if (sessionId == self.state.currentTurn) {
+      if (sessionId == self.state.currentTurn) {
-                let client = self.room.getClient(sessionId);
+        let client = self.room.getClient(sessionId)
-                let card = player.cards.values().next().value;
+        let card = player.cards.values().next().value
-                debugRoom('出牌时间到, 自动出牌: ', card.id);
+        debugRoom('出牌时间到, 自动出牌: ', card.id)
-                player.extraTime = 0;
+        player.extraTime = 0
-                if (client) {
+        if (client) {
-                    self.room.dispatcher.dispatch(new DiscardCommand(), {client, cards: [card.id], dtype: 1});
+          self.room.dispatcher.dispatch(new DiscardCommand(), {
-                }
+            client,
-            }
+            cards: [card.id],
+            dtype: 1
+          })
         }
-        this.room.beginSchedule(maxTime + player.extraTime, timeOverDraw, `draw_card`);
+      }
     }
+    this.room.beginSchedule(maxTime + player.extraTime, timeOverDraw, ClockNameConst.DRAW_CARD)
+  }
 }

src/rooms/commands/EatConfirmCommand.ts

@@ -8,6 +8,7 @@ import {Player} from "../schema/Player";
 import {Card} from "../schema/Card";
 import gameUtil from "../../utils/game.util";
 import {StateTypeEnum} from "../enums/StateTypeEnum";
+import { ClockNameConst } from '../../constants/ClockNameConst'
 
 /**
  * 根据条件决定吃牌玩家, 并执行吃牌逻辑
@@ -33,7 +34,7 @@ export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean
         }
         if (giveUpCount >= playerCount) {
             // 所有人都放弃了, 则取消定时, 直接进入下一轮
-            this.room.stopSchedule('eat_round');
+            this.room.stopSchedule(ClockNameConst.EAT_ROUND);
             // if (this.room.mainClock?.active) {
             //     this.room.mainClock.clear();
             // }
@@ -72,7 +73,7 @@ export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean
         if (player != null && (isFirst || timeUp)) {
             debugRoom(`真的开始吃牌了: ${player.id}, 场上牌: ${this.state.cards.size}, isFirst: ${isFirst}, timeUp: ${timeUp}`);
             // 如果有吃牌计时的话,停止吃牌计时
-            this.room.stopSchedule('eat_round');
+            this.room.stopSchedule(ClockNameConst.EAT_ROUND);
             let currentPlayer = this.state.players.get(this.state.currentTurn);
             currentPlayer.cardQueue.clear();
             player.cardQueue.clear();
@@ -95,7 +96,7 @@ export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean
                 debugRoom('选随从或者法术时间到, 自动出牌, 自动进入下一轮');
                 self.room.dispatcher.dispatch(new TurnEndCommand());
             }
-            self.room.beginSchedule(time, timeOverSelectPet, `select_pet`);
+            self.room.beginSchedule(time, timeOverSelectPet, ClockNameConst.SELECT_PET);
             let fromPlayer = this.state.players.get(this.state.currentTurn);
             // 成功后广播吃牌成功消息
             let client = this.room.getClient(player.id);

src/rooms/commands/GameRestartCommand.ts

@@ -4,6 +4,7 @@ import {Client} from "colyseus";
 import {PlayReadyCommand} from "./PlayReadyCommand";
 import {PlayerStateConst} from "../../constants/PlayerStateConst";
 import {error} from "../../common/Debug";
+import { ClockNameConst } from '../../constants/ClockNameConst'
 
 
 export class GameRestartCommand extends Command<CardGameState, {client: Client}> {
@@ -14,7 +15,7 @@ export class GameRestartCommand extends Command<CardGameState, {client: Client}>
             this.state.restartCount ++;
             player.state = PlayerStateConst.PLAYER_NORMAL;
             if (this.state.restartCount >= this.room.maxClients) {
-                this.room.stopSchedule('restart_schedule');
+                this.room.stopSchedule(ClockNameConst.RESTART_SCHEDULE);
             }
         } else {
             error(`${client.sessionId} not found!!`)

src/rooms/commands/GameResultCommand.ts

@@ -12,6 +12,7 @@ import {StateTypeEnum} from "../enums/StateTypeEnum";
 import {reportGameResult} from "../../common/WebApi";
 import {BaseConst} from "../../constants/BaseConst";
 import {Player} from "../schema/Player";
+import { ClockNameConst } from '../../constants/ClockNameConst'
 
 class GameResult{
     public id: string
@@ -184,13 +185,13 @@ export class GameResultCommand extends Command<CardGameState, {}> {
                     }
                 }
                 let time = new GameEnv().waitingPlayerTime * 1000;
-                self.room.beginSchedule(time, timeOutWaitingPlayer, 'waiting_player');
+                self.room.beginSchedule(time, timeOutWaitingPlayer, ClockNameConst.WAITING_PLAYER);
             } else { // 如果4个人都点击了重开, 理论上不存在这种情况
                 error(`所有人都点击了重新开始, 为啥还没开始游戏???`);
             }
         }
         let time = new GameEnv().gameResultTime * 1000;
-        this.room.beginSchedule(time, resultTimeOver, 'restart_schedule');
+        this.room.beginSchedule(time, resultTimeOver, ClockNameConst.RESTART_SCHEDULE);
         let saveData: any;
         try{
             saveData = (await self.reportGameResult(winner, mvp.id, results.get(mvp).mvpScore, results)).data.data;

src/rooms/commands/NextSubCommand.ts

@@ -5,6 +5,7 @@ import {GameEnv} from "../../cfg/GameEnv";
 import {debugRoom} from "../../common/Debug";
 import {EatConfirmCommand} from "./EatConfirmCommand";
 import {PlayerStateConst} from "../../constants/PlayerStateConst";
+import { ClockNameConst } from '../../constants/ClockNameConst'
 
 /**
  * 下一个吃牌轮
@@ -27,7 +28,7 @@ export class NextSubCommand extends Command<CardGameState, {}> {
             debugRoom('吃牌时间到, 进入下一轮')
             self.room.dispatcher.dispatch(new EatConfirmCommand(), {timeUp: true});
         }
-        this.room.beginSchedule(time, timeOverEat, `eat_round`);
+        this.room.beginSchedule(time, timeOverEat, ClockNameConst.EAT_ROUND);
     }
 
 }

src/rooms/commands/OnJoinCommand.ts

@@ -7,6 +7,7 @@ import {GameEnv} from "../../cfg/GameEnv";
 import {BaseConst} from "../../constants/BaseConst";
 import {getRandom} from "../../utils/number.util";
 import { getUserInfo, randomUserInfo } from '../../common/WebApi'
+import { ClockNameConst } from '../../constants/ClockNameConst'
 
 /**
  * 玩家成功加入房间
@@ -84,13 +85,13 @@ export class OnJoinCommand extends Command<CardGameState, {
           }
         }
         let time = new GameEnv().waitingPlayerTime * 1000;
-        self.room.beginSchedule(time, timeOutWaitingPlayer, 'waiting_player');
+        self.room.beginSchedule(time, timeOutWaitingPlayer, ClockNameConst.WAITING_PLAYER);
       } else if (this.room.clientCount() > 1 && this.room.clientCount() < this.room.maxClients) {
         let moreTime = new GameEnv().waitingPlayerOnePlus * 1000;
-        self.room.addScheduleTime(moreTime, 'play_join', 'waiting_player')
+        self.room.addScheduleTime(moreTime, 'play_join', ClockNameConst.WAITING_PLAYER)
       }
       if (this.state.players.size >= this.room.maxClients) {
-        this.room.stopSchedule('waiting_player');
+        this.room.stopSchedule(ClockNameConst.WAITING_PLAYER);
         this.room.lock().then(() => {
         });
         this.state.updateGameState(GameStateConst.STATE_WAIT_PREPARE);

src/rooms/commands/PlayReadyCommand.ts

@@ -7,6 +7,7 @@ import {GameEnv} from "../../cfg/GameEnv";
 import {SelectHeroCommand} from "./SelectHeroCommand";
 import {HeroCfg} from "../../cfg/parsers/HeroCfg";
 import {BaseConst} from "../../constants/BaseConst";
+import { ClockNameConst } from '../../constants/ClockNameConst'
 
 /**
  * 玩家已准备
@@ -26,8 +27,8 @@ export class PlayReadyCommand extends Command<CardGameState, {
         }
         // 如果所有人的状态都为已准备状态, 则开始发牌
         if (readyCount >= this.room.maxClients) {
-            this.room.stopSchedule('restart_schedule');
+            this.room.stopSchedule(ClockNameConst.RESTART_SCHEDULE);
-            this.room.stopSchedule('waiting_player');
+            this.room.stopSchedule(ClockNameConst.WAITING_PLAYER);
             // 比大小, 确定先手
             // return [new PrepareCommand()];
             // let i = 0;
@@ -59,7 +60,7 @@ export class PlayReadyCommand extends Command<CardGameState, {
                 }
             }
             let time = new GameEnv().pickHeroTime * 1000;
-            this.room.beginSchedule(time, pickHeroTimeOut, 'pick_hero');
+            this.room.beginSchedule(time, pickHeroTimeOut, ClockNameConst.PICK_HERO);
         }
 
     }

src/rooms/commands/SelectHeroCommand.ts

@@ -8,6 +8,7 @@ import {error} from "../../common/Debug";
 import {GameEnv} from "../../cfg/GameEnv";
 import {StateTypeEnum} from "../enums/StateTypeEnum";
 import {getCardGroup} from "../../common/WebApi";
+import { ClockNameConst } from '../../constants/ClockNameConst'
 
 /**
  * 选择英雄
@@ -91,7 +92,7 @@ export class SelectHeroCommand extends Command<CardGameState, { client: Client,
             }
         }
         if (readyCount >= this.room.maxClients) {
-            this.room.stopSchedule('pick_hero');
+            this.room.stopSchedule(ClockNameConst.PICK_HERO);
             return [new BeginGameCommand()];
         }
     }

src/rooms/commands/SelectPetCommand.ts

@@ -8,6 +8,7 @@ import { RoomOptions } from '../../cfg/RoomOptions'
 import assistantUtil from '../../utils/assistant.util'
 import { GameStateConst } from '../../constants/GameStateConst'
 import { debugRoom } from '../../common/Debug'
+import { ClockNameConst } from '../../constants/ClockNameConst'
 
 /**
  * 选择随从或者法术
@@ -73,7 +74,7 @@ export class SelectPetCommand extends Command<CardGameState, {
       return
     }
     //停止选随从计时, 并更新player.extraTime;
-    let elapsedTime = this.room.stopSchedule('select_pet')
+    let elapsedTime = this.room.stopSchedule(ClockNameConst.SELECT_PET)
     if (elapsedTime >= 0) {
       let count = elapsedTime - new GameEnv().playerActTime * 1000
       let newCount = player.extraTime - Math.min(count, 0)